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 7bf9ac2649..dcbd842e46 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,40 +16,12 @@
 			
 		</Promotion>
 
-<<<<<<< .mine
+
 		</Traits>
-=======
-		<Armour>
-			<Hack>7.0</Hack>
-			<Pierce>5.0</Pierce>
-			<Crush>12.0</Crush>
-		</Armour>
->>>>>>> .r6082
 
 	<Actions>
-<<<<<<< .mine
- 		
-=======
- 		<Attack>
-			<Melee>
- 				<Hack>15.0</Hack>
- 				<Pierce>7.0</Pierce>
-				<Crush>1.0</Crush>
-			</Melee>
-			<Charge>
-				<Hack>30.0</Hack>
-				<Pierce>14.0</Pierce>
-				<Crush>2.0</Crush>
-			</Charge>		
- 		</Attack>
 
-		<Move>
-			<Speed>6.75</Speed>
-			<Run>
-				<Speed>14.0</Speed>
-			</Run>
-		</Move>
->>>>>>> .r6082
+
 	</Actions>	
 
 	<Actor>units/hellenes/infantry_spearman_a.xml</Actor>