diff --git a/libs/music/sounds.ts b/libs/music/sounds.ts
index dd8a1344..8fe1a906 100644
--- a/libs/music/sounds.ts
+++ b/libs/music/sounds.ts
@@ -257,11 +257,7 @@ namespace sounds {
 
 namespace music {
     let numSoundsPlaying = 0;
-<<<<<<< Updated upstream
-    let soundsLimit = 3;
-=======
     const soundsLimit = 1;
->>>>>>> Stashed changes
 
     /**
      * Plays a sound