diff --git a/project.json b/project.json
index 485e8d6..799a49d 100644
--- a/project.json
+++ b/project.json
@@ -2,12 +2,18 @@
     "name": "crafter-event",
     "configurations": [
         {
+<<<<<<< HEAD
             "name": "base",
+=======
+            "name": "lib",
+>>>>>>> c98cbc28dcbe85be0d1ebb1cf764dbe7a008d6f7
             "interfaces": ["interfaces/Crafter.Event"],
             "type":"library"
+
         },
         {
             "name": "lib-debug",
+<<<<<<< HEAD
             "extends": ["base"],
             "debug":true,
             "dependencies": [
@@ -26,6 +32,10 @@
                     "configuration":"lib"
                 }
             ]
+=======
+            "debug" : true,
+            "extends": ["lib"]
+>>>>>>> c98cbc28dcbe85be0d1ebb1cf764dbe7a008d6f7
         }
     ]
 }