diff --git a/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiText.st b/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiText.st
index 4f390b3..9169b76 100644
--- a/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiText.st
+++ b/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiText.st
@@ -1,9 +1,9 @@
 converting
-abilitiesAsWikiText
+abilitiesAsWikiText 
 	| output |
 	output := '' writeStream.
-	output 
-		nextPutAll: '<ul style="list-style-type:none;">'; cr;
+	output
+		nextPutAll: '<ul style="list-style-type:none;">'; lf;
 		nextPutAll: (self abilitiesAsWikiTextFor: self currentAbilities marked: '⬢');
 		nextPutAll: (self abilitiesAsWikiTextFor: self pendingAbilities marked: '⬡');
 		nextPutAll: '</ul>'.
diff --git a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
index 9fd3b78..f6cbcd5 100644
--- a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
+++ b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
@@ -1,3 +1,7 @@
 accessing
 asJsonTiddler
-	^ self asTiddler asJson
\ No newline at end of file
+<<<<<<< HEAD
+	^ self asTiddler asJson
+=======
+	^ self asTiddler asJson 
+>>>>>>> master