diff --git a/config/custom_sprites.txt b/config/custom_sprites.txt
index dc5302cb7f..4d33974c72 100644
--- a/config/custom_sprites.txt
+++ b/config/custom_sprites.txt
@@ -1,3 +1,10 @@
+<<<<<<< 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
diff --git a/icons/mob/custom_synthetic_vr.dmi b/icons/mob/custom_synthetic_vr.dmi
index 4471407fa7..efd3e24386 100644
Binary files a/icons/mob/custom_synthetic_vr.dmi and b/icons/mob/custom_synthetic_vr.dmi differ