diff --git a/javascript_implementation/README.md b/javascript_implementation/README.md
index 7761947..b7e1c65 100644
--- a/javascript_implementation/README.md
+++ b/javascript_implementation/README.md
@@ -15,11 +15,7 @@ See **demo** at [dematte.at/cpn/javaScript_implementation](http://dematte.at/cpn
         klass: window.ColorPicker,
         input: elm,
         patch: elm,
-<<<<<<< HEAD
         init: function(elm, colors){}, // initialization callback (before colorPicker gets initialized though)
-=======
-        init: function(elm){}, // initialization callback (before colorPicker gets initialized though)
->>>>>>> FETCH_HEAD
         // animationSpeed: 200, will be supported soon
         // draggable: true,
         multipleInstances: false