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 7548e4a375..98ca8d64b2 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
@@ -26,29 +26,7 @@
 	</Traits>
 
 	<Actions>
-<<<<<<< .mine
- 		
-=======
- 		<Attack>
-			<Melee>
- 				<Hack>15.0</Hack>
- 				<Pierce>6.0</Pierce>
-				<Crush>0.2</Crush>
-			</Melee>
-			<Charge>
-				<Hack>30.0</Hack>
-				<Pierce>12.0</Pierce>
-				<Crush>0.5</Crush>
-			</Charge>		
- 		</Attack>
 
-		<Move>
-			<Speed>7.0</Speed>
-			<Run>
-				<Speed>15.0</Speed>
-			</Run>
-		</Move>
->>>>>>> .r6082
 	</Actions>	
 	
 	<Actor>units/hellenes/infantry_spearman_b.xml</Actor>