diff --git a/binaries/data/mods/official/entities/units/hele_infantry_spearman_a.xml b/binaries/data/mods/official/entities/units/hele_infantry_spearman_a.xml
index 3cd9ea1110..7bf9ac2649 100644
--- a/binaries/data/mods/official/entities/units/hele_infantry_spearman_a.xml
+++ b/binaries/data/mods/official/entities/units/hele_infantry_spearman_a.xml
@@ -16,19 +16,20 @@
 			
 		</Promotion>
 
+<<<<<<< .mine
+		</Traits>
+=======
 		<Armour>
 			<Hack>7.0</Hack>
 			<Pierce>5.0</Pierce>
 			<Crush>12.0</Crush>
 		</Armour>
-
-		<Health>
-			<Max>100</Max>
-		</Health>
-	
-	</Traits>
+>>>>>>> .r6082
 
 	<Actions>
+<<<<<<< .mine
+ 		
+=======
  		<Attack>
 			<Melee>
  				<Hack>15.0</Hack>
@@ -48,6 +49,7 @@
 				<Speed>14.0</Speed>
 			</Run>
 		</Move>
+>>>>>>> .r6082
 	</Actions>	
 
 	<Actor>units/hellenes/infantry_spearman_a.xml</Actor>
diff --git a/binaries/data/mods/official/entities/units/hele_infantry_spearman_b.xml b/binaries/data/mods/official/entities/units/hele_infantry_spearman_b.xml
index 5db3ef8ef0..7548e4a375 100644
--- a/binaries/data/mods/official/entities/units/hele_infantry_spearman_b.xml
+++ b/binaries/data/mods/official/entities/units/hele_infantry_spearman_b.xml
@@ -15,30 +15,20 @@
 		
 		</Id>
 		
-		<Creation>
-			<Time>20</Time>
-			<Resource>
- 				<Food>65</Food>
-				<Wood>2</Wood>
-				<Ore>1</Ore>
- 			</Resource>
-		</Creation>
-		
+	
 		<Promotion>
 				
 			<Entity>hele_infantry_spearman_a</Entity>
 			
 		</Promotion>
 
-		<Armour>
-			<Hack>5.0</Hack>
-			<Pierce>4.5</Pierce>
-			<Crush>10.0</Crush>
-		</Armour>
-		
+	
 	</Traits>
 
 	<Actions>
+<<<<<<< .mine
+ 		
+=======
  		<Attack>
 			<Melee>
  				<Hack>15.0</Hack>
@@ -58,6 +48,7 @@
 				<Speed>15.0</Speed>
 			</Run>
 		</Move>
+>>>>>>> .r6082
 	</Actions>	
 	
 	<Actor>units/hellenes/infantry_spearman_b.xml</Actor>
diff --git a/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml b/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml
index 20aad72d4e..886cc31a97 100644
--- a/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml
+++ b/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml
@@ -8,6 +8,8 @@
 			<Icon_Cell>5</Icon_Cell>
 		</Id>
 
+<<<<<<< .mine
+=======
 		<Armour>
 			<Hack>8.0</Hack>
 			<Pierce>5.0</Pierce>
@@ -17,10 +19,14 @@
 		<Health>
 			<Max>120</Max>
 		</Health>
+>>>>>>> .r6082
 	
 	</Traits>
 
 	<Actions>
+<<<<<<< .mine
+ 		
+=======
  			<Attack>
 			<Melee>
  				<Hack>16.0</Hack>
@@ -40,6 +46,7 @@
 				<Speed>14.0</Speed>
 			</Run>
 		</Move>
+>>>>>>> .r6082
 	</Actions>	
 
 	<Actor>units/hellenes/infantry_spearman_e.xml</Actor>