diff --git a/composer.json b/composer.json
index 86716dd23..4d5d6b06a 100644
--- a/composer.json
+++ b/composer.json
@@ -46,11 +46,7 @@
     },
     "extra": {
         "branch-alias": {
-<<<<<<< HEAD
             "dev-master": "3.0-dev"
-=======
-            "dev-master": "2.12-dev"
->>>>>>> 2.x
         }
     }
 }