diff --git a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
index f6cbcd5..9fd3b78 100644
--- a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
+++ b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st
@@ -1,7 +1,3 @@
 accessing
 asJsonTiddler
-<<<<<<< HEAD
-	^ self asTiddler asJson
-=======
-	^ self asTiddler asJson 
->>>>>>> master
+	^ self asTiddler asJson
\ No newline at end of file