diff --git a/main.js b/main.js
index 6d69e545..52c83c29 100644
--- a/main.js
+++ b/main.js
@@ -1383,7 +1383,7 @@ function addZones(number = 1) {
     }
 
     const invasion = rw({"Invasion":4, "Occupation":3, "Raid":2, "Conquest":2, 
-      "Subjugation":1, "Foray":1, "Irruption":1, "Incursion":2, "Pillage":1, "Intervention":1});
+      "Subjugation":1, "Irruption":1, "Foray":1, "Incursion":2, "Pillage":1, "Intervention":1});
     const name = getAdjective(invader.name) + " " + invasion;
     data.push({name, type:"Invasion", cells:cellsArray, fill:"url(#hatch1)"});
   }
diff --git a/modules/ui/burgs-editor.js b/modules/ui/burgs-editor.js
index b33c5411..6396f9e6 100644
--- a/modules/ui/burgs-editor.js
+++ b/modules/ui/burgs-editor.js
@@ -368,7 +368,11 @@ function editBurgs() {
   }
 
   function downloadBurgsData() {
+<<<<<<< HEAD
     let data = "Id,Burg,Province,State,Culture,Religion,Population,Longitude,Latitude,Elevation ("+heightUnit.value+"),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty Town\n"; // headers
+=======
+    let data = "Id,Burg,Province,State,Culture,Religion,Population,Longitude,Latitude,Elevation ("+heightUnit.value+"),Capital,Port,Citadel,Walls,Plaza,Temple,Shanty\n"; // headers
+>>>>>>> 40f4f308142aebc86427c252046d3d53df81b1cc
     const valid = pack.burgs.filter(b => b.i && !b.removed); // all valid burgs
 
     valid.forEach(b => {
@@ -393,7 +397,12 @@ function editBurgs() {
       data += b.walls ? "walls," : ",";
       data += b.plaza ? "plaza," : ",";
       data += b.temple ? "temple," : ",";
+<<<<<<< HEAD
       data += b.shanty ? "shanty town\n" : "\n";
+=======
+      data += b.shanty ? "shanty\n" : "\n";
+
+>>>>>>> 40f4f308142aebc86427c252046d3d53df81b1cc
     });
 
     const name = getFileName("Burgs") + ".csv";