diff --git a/package.json b/package.json
index e8abe04..3a1d30f 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "CacheUMLExplorer",
-<<<<<<< HEAD
   "version": "1.0.0",
-=======
-  "version": "0.15.1",
->>>>>>> 59d55bd711e05c45ac628bff99372683be3b7378
   "description": "An UML Class explorer for InterSystems Caché",
   "directories": {
     "test": "test"