diff --git a/brigade.json b/brigade.json
index f403eaa1e..c5b27e47a 100644
--- a/brigade.json
+++ b/brigade.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< HEAD
   "dependencies": {
       "@brigadecore/brigade-utils": "0.3.0"
   }
-=======
-    "dependencies": {
-        "brigade-utils-test": "0.0.5"
-    }
->>>>>>> add brigade.json for brigade-utils/KindJob
 }
\ No newline at end of file