diff --git a/hosts/sakopc/configuration.nix b/hosts/sakopc/configuration.nix
index d2f901c3..591a4aa5 100644
--- a/hosts/sakopc/configuration.nix
+++ b/hosts/sakopc/configuration.nix
@@ -78,15 +78,9 @@
       pipewire.enable = true;
     };
     media = {
-<<<<<<< HEAD
-      mpd.enable = true;
-      ncmpcpp.enable = true;
-      mopidy.enable = true;
-=======
       mpd.enable = false;
       ncmpcpp.enable = false;
       mopidy.enable = false;
->>>>>>> 3d81864 (nvm)
     };
     shell = {
       nix = {