diff --git a/module.json b/module.json
index 381acec..7001d8d 100644
--- a/module.json
+++ b/module.json
@@ -108,11 +108,6 @@
       "system": "dnd5e",
       "path": "packs/Subclass"
     }
-<<<<<<< HEAD
   ],
   "id": "SharedData_global"
 }
-=======
-  ]
-}
->>>>>>> 437464ddb1c200a3db307a78fbaf671763fc6015