diff --git a/package.json b/package.json
index d5f6756c1..854456744 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name"        : "semantic-ui",
-<<<<<<< HEAD
   "version"     : "2.0.0",
-=======
-  "version"     : "1.12.3",
->>>>>>> 1f541d830bd40a5594621aedec8a326391430c15
   "title"       : "Semantic UI",
   "description" : "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
   "homepage"    : "http://www.semantic-ui.com",