diff --git a/code/game/sound.dm b/code/game/sound.dm
index 5add09823ca..fa54a5dcd8a 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -75,5 +75,4 @@ var/const/SURROUND_CAP = 7
 			if ("hiss") soundin = pick('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
 			if ("pageturn") soundin = pick('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg')
 			if ("gunshot") soundin = pick('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')
->>>>>>> 039e81687217c0c9819ca1a88d8ac26cb8d4f8d1
 	return soundin
\ No newline at end of file