diff --git a/brigade.json b/brigade.json
index c5b27e47a..f403eaa1e 100644
--- a/brigade.json
+++ b/brigade.json
@@ -1,5 +1,11 @@
 {
+<<<<<<< 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