module/items/item-sheet.js

@@ -94,6 +94,7 @@ export class ItemSheetKH extends ItemSheet {
                         skillList.push(item)
                     }
                 }
+
                 this.position.width = 450;
                 this.position.height = 605;
                 break;

system.json

@@ -81,6 +81,11 @@
     "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
 }