diff --git a/home/modules/niri.nix b/home/modules/niri.nix
index cb6f4b0..be1faab 100644
--- a/home/modules/niri.nix
+++ b/home/modules/niri.nix
@@ -112,10 +112,7 @@ in
   };
   programs.niri = {
     # enable = true;
-<<<<<<< HEAD
-=======
     package = pkgs.niri-stable;
->>>>>>> 4827e2d (updates?)
     settings = {
       prefer-no-csd = true;
       binds = with config.lib.niri.actions; let
diff --git a/modules/desktop.nix b/modules/desktop.nix
index bd7c52f..4b9db31 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -19,11 +19,7 @@ in
 
 
   boot = {
-<<<<<<< HEAD
     kernelPackages = pkgs.linuxPackages_zen;
-=======
-    kernelPackages = pkgs.linuxPackages_6_18;
->>>>>>> 4827e2d (updates?)
     kernelParams = [ "mem_sleep_default=deep" "nvme.noacpi=1" ];
   };
 
diff --git a/modules/gaming.nix b/modules/gaming.nix
index ba7a6e7..649a4e8 100644
--- a/modules/gaming.nix
+++ b/modules/gaming.nix
@@ -107,11 +107,7 @@ with lib;
   };
   environment.systemPackages = with pkgs; [
     airshipper
-<<<<<<< HEAD
     lutris
-=======
-    # lutris
->>>>>>> 4827e2d (updates?)
     heroic
     protonup-qt
     winePackages.waylandFull
diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix
index d48079c..57e7c05 100644
--- a/pkgs/desktop-packages.nix
+++ b/pkgs/desktop-packages.nix
@@ -16,11 +16,7 @@
     # kdePackages.ark
     harper
     mumble
-<<<<<<< HEAD
     niri
-=======
-    #niri
->>>>>>> 4827e2d (updates?)
     bluetui
     # pantalaimon
     ifuse
@@ -40,11 +36,7 @@
     kdePackages.ffmpegthumbs
     kdePackages.kdegraphics-thumbnailers
     kdePackages.kdesdk-thumbnailers
-<<<<<<< HEAD
-    inputs.affinity-nix.packages.x86_64-linux.v3
-=======
     inputs.affinity-nix.packages.x86_64-linux.affinity-v3
->>>>>>> 4827e2d (updates?)
     android-tools
     # xfce.thunar
     # xfce.tumbler
diff --git a/scripts/lfgimg.lisp b/scripts/lfgimg.lisp
index 4db6f30..38edf62 100755
--- a/scripts/lfgimg.lisp
+++ b/scripts/lfgimg.lisp
@@ -1,14 +1,3 @@
-<<<<<<< HEAD
-;; #!/run/current-system/sw/bin/sbcl --script
-
-;; (load "~/quicklisp/setup.lisp")
-;; (ql:quickload '(drakma lquery))
-
-(defun get-images ()
-  (loop for i from 748 to 1489 do
-    (let* ((request (drakma:http-request
-		     (concatenate 'string "https://www.lfg.co/page/" (write-to-string i))))
-=======
 #!/usr/bin/env -S sbcl --script
 
 (load "~/quicklisp/setup.lisp")
@@ -18,29 +7,20 @@
   (loop for i from 1490 to 1734 do
     (let* ((request (drakma:http-request
 		     (concatenate 'string "https://www.lfg.co/read/comic/" (write-to-string i))))
->>>>>>> 4827e2d (updates?)
 	   (parsed-content (lquery:$ (lquery:initialize request)))
 	   (url (vector-pop (lquery:$ parsed-content "img" (attr :src))))
 	   (img (drakma:http-request url)))
 
       (if (not (search ".jpg" url))
 	  (with-open-file (stream
-<<<<<<< HEAD
-			   (concatenate 'string "/home/chris/Pictures/lfg/" (write-to-string i) ".gif")
-=======
 			   (concatenate 'string "/home/chris/pics/lfg/" (write-to-string i) ".gif")
->>>>>>> 4827e2d (updates?)
 			   :direction :output
 			   :if-exists :supersede
 			   :if-does-not-exist :create
 			   :element-type 'unsigned-byte)
 	    (write-sequence img stream))
 	  (with-open-file (stream
-<<<<<<< HEAD
-			   (concatenate 'string "/home/chris/Pictures/lfg/" (write-to-string i) ".jpg")
-=======
 			   (concatenate 'string "/home/chris/pics/lfg/" (write-to-string i) ".jpg")
->>>>>>> 4827e2d (updates?)
 			   :direction :output
 			   :if-exists :supersede
 			   :if-does-not-exist :create
diff --git a/systems/kaladin/hardware-configuration.nix b/systems/kaladin/hardware-configuration.nix
index 71e488a..f4954ee 100644
--- a/systems/kaladin/hardware-configuration.nix
+++ b/systems/kaladin/hardware-configuration.nix
@@ -12,27 +12,6 @@
 
 
   fileSystems."/" =
-<<<<<<< HEAD
-    { device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
-      fsType = "btrfs";
-      options = [ "subvol=@" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
-      fsType = "btrfs";
-      options = [ "subvol=@home" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
-    };
-
-  fileSystems."/snapshots" =
-    { device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
-      fsType = "btrfs";
-      options = [ "subvol=@snapshots" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1D14-97A8";
-=======
     { device = "/dev/disk/by-label/ROOT";
       fsType = "btrfs";
       options = [ "subvol=root" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
@@ -52,27 +31,18 @@
 
   fileSystems."/boot" =
     { device = "/dev/disk/by-label/BOOT";
->>>>>>> 4827e2d (updates?)
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
   fileSystems."/run/media/chris/Storage" =
-<<<<<<< HEAD
-    { device = "/dev/disk/by-uuid/4c7d4273-7b72-4aa8-8e1c-e281543d06cb";
-=======
     { device = "/dev/disk/by-label/Storage";
->>>>>>> 4827e2d (updates?)
       fsType = "btrfs";
       options = [ "noatime" "space_cache=v2" "compress=zstd:1" ];
     };
 
   fileSystems."/run/media/chris/backup" =
-<<<<<<< HEAD
-    { device = "/dev/disk/by-uuid/4286b9ef-e8ed-49a0-9eec-91b8ee05b2cb";
-=======
     { device = "/dev/disk/by-label/backup";
->>>>>>> 4827e2d (updates?)
       fsType = "ext4";
     };