diff --git a/system.json b/system.json
index 5283f86..2fd1a35 100644
--- a/system.json
+++ b/system.json
@@ -2,11 +2,7 @@
   "id": "kidsonbrooms",
   "title": "Kids on Brooms System",
   "description": "The Kids on Brooms system for FoundryVTT!",
-<<<<<<< HEAD
   "version": "1.1.6",
-=======
-  "version": "1.1.5",
->>>>>>> master
   "compatibility": {
     "minimum": 12,
     "verified": 12.331