Fix conflicts

front/src/Components/Menu/SettingsSubMenu.svelte

@@ -55,10 +55,11 @@
             localUserStore.setMicrophonePrivacySettings(valueMicrophonePrivacySettings);
         }
 
-    if (change) {
+        audioManagerVolumeStore.setDecreaseWhileTalking(decreaseAudioPlayerVolumeWhileTalking);
-      window.location.reload();
+
-    }
+        if (change) {
-    audioManagerVolumeStore.setDecreaseWhileTalking(decreaseAudioPlayerVolumeWhileTalking);
+            window.location.reload();
+        }
 
         closeMenu();
     }
@@ -100,13 +101,14 @@
         localUserStore.setIgnoreFollowRequests(ignoreFollowRequests);
     }
 
-  function closeMenu() {
-    menuVisiblilityStore.set(false);
-  }
     function changeDecreaseAudioPlayerVolumeWhileTalking() {
         localUserStore.setDecreaseAudioPlayerVolumeWhileTalking(decreaseAudioPlayerVolumeWhileTalking);
     }
 
+    function closeMenu() {
+        menuVisiblilityStore.set(false);
+    }
+
     const isMobile = isMediaBreakpointUp("md");
 </script>
 
@@ -230,15 +232,15 @@
                 on:change={changeIgnoreFollowRequests}
             />
             <span>{$LL.menu.settings.ignoreFollowRequest()}</span>
-          <label>
+            <label>
-            <input
+                <input
-              type="checkbox"
+                    type="checkbox"
-              class="nes-checkbox is-dark"
+                    class="nes-checkbox is-dark"
-              bind:checked={decreaseAudioPlayerVolumeWhileTalking}
+                    bind:checked={decreaseAudioPlayerVolumeWhileTalking}
-              on:change={changeDecreaseAudioPlayerVolumeWhileTalking}
+                    on:change={changeDecreaseAudioPlayerVolumeWhileTalking}
-            />
+                />
-            <span>{$LL.audio.manager.reduce()}</span>
+                <span>{$LL.audio.manager.reduce()}</span>
-          </label>
+            </label>
         </label>
     </section>
 </div>