diff --git a/hosts/kuroko/configuration.nix b/hosts/kuroko/configuration.nix
index 7ddbea0..de8206d 100644
--- a/hosts/kuroko/configuration.nix
+++ b/hosts/kuroko/configuration.nix
@@ -19,7 +19,6 @@
   networking.hostName = "kuroko"; # Define your hostname.
   services.ratbagd.enable = true;
   hardware.graphics.enable32Bit = true;
-  xwayland.enable = true;
   hardware.pulseaudio.support32Bit = true;
   #Nvidia Hardware begins 
   hardware.nvidia = {
diff --git a/users/kaitotlex/home.nix b/users/kaitotlex/home.nix
index d1bf3fb..84339bc 100644
--- a/users/kaitotlex/home.nix
+++ b/users/kaitotlex/home.nix
@@ -24,11 +24,9 @@
     # feel free to add your own or remove some of them
     #davinci-resolve
     rasm
-<<<<<<< HEAD
     arduino-language-server
-=======
-    betterbird-unwrapped
->>>>>>> 1ae8f16 (No)
+    #betterbird-unwrapped
+    osu-lazer
     geoclue2
     lua
     tetrio-desktop