diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java b/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
index 3631987a..bff40e6c 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
@@ -32,9 +32,7 @@ public class NetworkSettingsCommand {
     private String urlRedirectCustomUrl;
     private String urlRedirectType;
     private int port;
-<<<<<<< HEAD
     private boolean toast;
-=======
 
     public void setPortForwardingEnabled(boolean portForwardingEnabled) {
         this.portForwardingEnabled = portForwardingEnabled;
@@ -75,7 +73,6 @@ public class NetworkSettingsCommand {
         this.port = port;
     }
 
-<<<<<<< HEAD
     public boolean isToast() {
         return toast;
     }
@@ -84,7 +81,6 @@ public class NetworkSettingsCommand {
         this.toast = toast;
     }
 
-=======
     public String getUrlRedirectType() {
         return urlRedirectType;
     }
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
index 8a2569ba..60eda464 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
@@ -82,7 +82,6 @@ public class DLNASettingsController {
         settingsService.save();
         upnpService.setMediaServerEnabled(dlnaEnabled);
     }
-<<<<<<< HEAD
 
     public void setSettingsService(SettingsService settingsService) {
         this.settingsService = settingsService;
@@ -92,4 +91,3 @@ public class DLNASettingsController {
         this.upnpService = upnpService;
     }
 }
-=======
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java b/libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
index ec974e65..ab740ad4 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
@@ -82,7 +82,6 @@ public class SonosSettingsController {
         sonosService.setMusicServiceEnabled(false);
         sonosService.setMusicServiceEnabled(sonosEnabled);
     }
-<<<<<<< HEAD
 
     public void setSettingsService(SettingsService settingsService) {
         this.settingsService = settingsService;
@@ -92,4 +91,3 @@ public class SonosSettingsController {
         this.sonosService = sonosService;
     }
 }
-=======