diff --git a/home/config/hypr/monitor.conf b/home/config/hypr/monitor.conf
index ffda077..57e1647 100755
--- a/home/config/hypr/monitor.conf
+++ b/home/config/hypr/monitor.conf
@@ -1,4 +1,3 @@
-monitor=desc:ASUSTek COMPUTER INC ASUS VG32VQ1B 0x00002271, 2560x1440@165, 0x0, 1
-monitor=desc:Acer Technologies XV272U V3 7422007E54222, 2560x1440@144, -1440x-540, auto, transform, 1
+monitor=desc:ASUSTek COMPUTER INC ASUS VG32VQ1B 0x00002271,2560x1440@165, 0x0, 1
+monitor=desc:Acer Technologies XV272U V3 7422007E54222, 2560x1440@144, -1440x-540, 1, transform, 1
 monitor=desc:LG Display 0x0665, auto, 0x0, 1
-
diff --git a/system/dev/dn-lap/hardware-configuration.nix b/system/dev/dn-lap/hardware-configuration.nix
index 697828b..481de2b 100644
--- a/system/dev/dn-lap/hardware-configuration.nix
+++ b/system/dev/dn-lap/hardware-configuration.nix
@@ -6,54 +6,26 @@
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-<<<<<<<< HEAD:system/dev/dn-lap/hardware-configuration.nix
   boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e9be9e66-c3cb-4613-be7f-c23e7f89b508";
+    {
+      device = "/dev/disk/by-uuid/e9be9e66-c3cb-4613-be7f-c23e7f89b508";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/B2AB-C9E4";
+    {
+      device = "/dev/disk/by-uuid/B2AB-C9E4";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
-========
-  boot.initrd.availableKernelModules = [
-    "vmd"
-    "dm-raid"
-    "xhci_pci"
-    "thunderbolt"
-    "nvme"
-    "usbhid"
-    "uas"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelParams = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/nixos";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/BOOT";
-    fsType = "vfat";
-    options = [ "fmask=0077" "dmask=0077" ];
-  };
->>>>>>>> 552e732 (test: dn-lap test build):system/dev/dn-pre7780/hardware-configuration.nix
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/57d3a2d7-37e1-4e4b-be64-efcb2e6d6391"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/57d3a2d7-37e1-4e4b-be64-efcb2e6d6391"; }];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's