diff --git a/config/custom_sprites.txt b/config/custom_sprites.txt
index 4d33974c72..18fd6b4b0f 100644
--- a/config/custom_sprites.txt
+++ b/config/custom_sprites.txt
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-ckey|state
-lunarfleet|Clea-Nor
-jademanique|B.A.U-Kingside
-=======
 ckey|state
 lunarfleet|Clea-Nor
 jademanique|B.A.U-Kingside
-argonne|RUSS
->>>>>>> 046f0e3e98... Merge pull request #13450 from Astra-Quark/master