diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml
index 431928ebb..e120f273a 100644
--- a/SQF/dayz_epoch_b/stringtable.xml
+++ b/SQF/dayz_epoch_b/stringtable.xml
@@ -285,8 +285,6 @@
 			<French>Vous utilisez une version incorrecte de DAYZ_CODE, veuillez télécharger ce fichier depuis dayzepoch.com (Vous utilisez la version %1 et le serveur utilise la version %2)</French>
 			<Czech>Máte nesprávnou verzi DAYZ_CODE, stáhněte si prosím aktuální soubor z dayzepoch.com (Vaše verze je %1 a na serveru běží verze %2)</Czech>
 		</Key>
-<<<<<<< HEAD
-=======
 		<Key ID="str_player_20">
 			<Original>\n\nYou must be near a water-source such as a pond or well to refill your water bottles</Original>
 			<English>\n\nYou must be near a water-source such as a pond or well to refill your water bottles</English>
@@ -801,7 +799,6 @@
 			<French>FEMME</French>
 			<Czech>ŽENA</Czech>
 		</Key>
->>>>>>> upstream/master
 	</Package>
 	<Package name="playerstats">
 		<Key ID="str_playerstats_bandit">
@@ -1339,8 +1336,6 @@
 			<French>Améliorer %1</French>
 			<Czech>Vylepšit %1</Czech>
 		</Key>
-<<<<<<< HEAD
-=======
 		<Key ID="str_actions_medical_14">
 			<Original>Unload patients from %1</Original>
 			<English>Unload patients from %1</English>
@@ -1409,7 +1404,6 @@
 			<French>Examiner le corps</French>
 			<Czech>Prozkoumat tělo</Czech>
 		</Key>
->>>>>>> upstream/master
 		<Key ID="STR_ACTIONS_BUILD_EPOCH">
 			<Original>Build %1</Original>
 			<English>Build %1</English>
@@ -1542,8 +1536,6 @@
 		</Key>
 	</Package>
 	<Package name="equipment_code">
-<<<<<<< HEAD
-=======
 		<Key ID="STR_CRAFT_NAME_X">
 			<English>Craft Blueprint</English>
 			<German>Blaupause erstellen</German>
@@ -3122,7 +3114,6 @@
 			<French>Votre couteau semble trop émoussé</French>
 			<Czech>Vypadá to, že tvůj nůž je příliš tupý.</Czech>
 		</Key>
->>>>>>> upstream/master
 		<Key ID="STR_FOOD_EQIP_CODE_NAME_0">
 			<Original>Raw Meat</Original>
 			<English>Raw Meat</English>
@@ -3252,9 +3243,7 @@
 			<Dutch>Rundersteak</Dutch>
 			<French>Bifteck</French>
 			<Czech>Hovězí maso</Czech>
-		</Key>
-<<<<<<< HEAD
-=======
+		</Key>		
 		<Key ID="STR_FOODCOOKED_EQUIP_CODE_DESC_6">
 			<Original>Beefsteak to be used for sustainment.</Original>
 			<English>Beefsteak to be used for sustainment.</English>
@@ -3669,7 +3658,6 @@
 			<French>Une boîte intacte d'haricots noirs "Griff".</French>
 			<Czech>Čistá, ještě neotevřená plechovka Griffových černých fazolí.</Czech>
 		</Key>
->>>>>>> upstream/master
 		<Key ID="STR_FOOD_NAME_CAN_GRIFF_EMPTY">
 			<Original>Tin Can</Original>
 			<English>Tin Can</English>