diff --git a/flake.lock b/flake.lock
index f363931..258de3e 100755
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,19 @@
         ]
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1690303752,
         "narHash": "sha256-2YiwFHQERGoaORNORmsdmVlPD8CVVwlwbV2+f77sFhg=",
         "owner": "nix-community",
         "repo": "home-manager",
         "rev": "ba2c0737cc848db03470828fdb5e86df75ed42a8",
+=======
+        "lastModified": 1690476848,
+        "narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da",
+>>>>>>> 24e8b92afc7cea9796f0ced0263fd541d2250c33
         "type": "github"
       },
       "original": {
@@ -22,11 +30,19 @@
     },
     "nixpkgs": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1690179384,
         "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a",
+=======
+        "lastModified": 1690272529,
+        "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
+>>>>>>> 24e8b92afc7cea9796f0ced0263fd541d2250c33
         "type": "github"
       },
       "original": {
diff --git a/systems/framework.nix b/systems/framework.nix
index 1c1f4ec..79f9901 100755
--- a/systems/framework.nix
+++ b/systems/framework.nix
@@ -66,7 +66,7 @@
   '';
 
   #scaling
-  services.xserver.dpi = 227;
+  # services.xserver.dpi = 227;
 
   # Mis-detected by nixos-generate-config
   # https://github.com/NixOS/nixpkgs/issues/171093