diff --git a/module/items/item-sheet.js b/module/items/item-sheet.js
index e8a5496..1957bf5 100644
--- a/module/items/item-sheet.js
+++ b/module/items/item-sheet.js
@@ -94,7 +94,6 @@ export class ItemSheetKH extends ItemSheet {
                         skillList.push(item)
                     }
                 }
-
                 this.position.width = 450;
                 this.position.height = 605;
                 break;
diff --git a/system.json b/system.json
index 71acbef..07698f4 100644
--- a/system.json
+++ b/system.json
@@ -81,11 +81,6 @@
     "url": "https://pi.rikspolisen.se/foundryvtt/kopparhavet",
     "socket": true,
     "manifest": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/raw/branch/master/system.json",
-<<<<<<< HEAD
     "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.4.zip",
     "license": "LICENCE.txt"
-=======
-    "download": "https://pi.rikspolisen.se/foundryvtt/kopparhavet/archive/v0.0.3.zip",
-    "license": ""
->>>>>>> master
 }