diff --git a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm
index e2f863dae5..4f241c4b6f 100644
--- a/code/modules/client/preference_setup/loadout/loadout_general_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_general_vr.dm
@@ -94,5 +94,10 @@
 	
 /datum/gear/schnapsen
 	display_name = "schnapsen playing cards"
+<<<<<<< HEAD
 	description = "French-suit playing cards! Pre-picked for 2-player mode."
-	path = /obj/item/weapon/deck/schnapsen
\ No newline at end of file
+	path = /obj/item/weapon/deck/schnapsen
+=======
+	description = "An ancient Austro-Hungarian suit of cards!"
+	path = /obj/item/weapon/deck/schnapsen
+>>>>>>> ce50127b0a... Merge pull request #12997 from Runa-Dacino/schnapsen_fix