diff --git a/home/profiles/cli/default.nix b/home/profiles/cli/default.nix
index 05ae90c..685dc89 100644
--- a/home/profiles/cli/default.nix
+++ b/home/profiles/cli/default.nix
@@ -37,19 +37,12 @@
     iftop
     wget
     curl
-<<<<<<< HEAD
-    eza
-    bat
-    fd
-    # ncdu
-=======
     eza 
     bat
     fd
     ncdu
     du-dust 
     # dia-cli
->>>>>>> nvim-rewrite
     duf
     trash-cli
     nix-index
diff --git a/hosts/deck/default.nix b/hosts/deck/default.nix
index dca448f..8149865 100644
--- a/hosts/deck/default.nix
+++ b/hosts/deck/default.nix
@@ -35,11 +35,8 @@
   jovian.devices.steamdeck.enable = true;
   jovian.steam.user = "anish";
   jovian.steam.autoStart = true;
-<<<<<<< Updated upstream
   jovian.steam.desktopSession = "gnome";
-  jovian.decky-loader.enable = true;
-=======
-  jovian.steam.desktopSession = "none+bspwm";
+  # jovian.steam.desktopSession = "none+bspwm";
 
   # Install XR drivers
   environment.systemPackages = with pkgs; [
@@ -51,5 +48,4 @@
     xrlinuxdriver
   ];
 
->>>>>>> Stashed changes
 }