diff --git a/flake.nix b/flake.nix
index 14964c7..ddc7dba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,19 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
+<<<<<<< HEAD
     ethui.url = "github:ethui/ethui/v1.19.2";
+=======
+    quickshell = {
+      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    ethui = {
+      url = "github:ethui/ethui";
+      ref="flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    }
+>>>>>>> 08aa572 (wip)
   };
 
   outputs =