diff --git a/home.nix b/home.nix
index fbf1545..1fecfdb 100644
--- a/home.nix
+++ b/home.nix
@@ -61,11 +61,7 @@
     gimp obs-studio blender kdenlive meson hugo gnumake ninja go
     nodejs godot_4 rustup pavucontrol audacity zeroad xonotic
     openra font-awesome symbola noto-fonts-color-emoji material-icons
-<<<<<<< HEAD
     spotify brightnessctl swayidle
-=======
-    spotify brightnessctl
->>>>>>> 55c48b883f8ed62ad7b0cf3fbeb9820e3ba19786
     # Import Scripts
     (import ./config/scripts/emopicker9000.nix { inherit pkgs; })
     (import ./config/scripts/task-waybar.nix { inherit pkgs; })