diff --git a/flake.lock b/flake.lock
index ffa0bda..802d041 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,13 +24,19 @@
     "mac-brcm-fw": {
       "flake": false,
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1664744853,
         "narHash": "sha256-i5EFVTIDHQCtFg/OFLmjOzbJqhpwy4MjwBmFUnq0DjI=",
         "path": "/home/jade/mac-brcm-fw",
+=======
+        "lastModified": 1,
+        "narHash": "sha256-ewzM8IBKNFCx73ah5rflcdx605ukRF3oTWwih2CTsvs=",
+        "path": "./mac-brcm-fw",
+>>>>>>> 801cd65 (stuff)
         "type": "path"
       },
       "original": {
-        "path": "../mac-brcm-fw",
+        "path": "./mac-brcm-fw",
         "type": "path"
       }
     },
diff --git a/flake.nix b/flake.nix
index cac5809..c1ade8f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
     };
     nixos-hardware.url = "github:kekrby/nixos-hardware";
     mac-brcm-fw = {
-      url = "path:../mac-brcm-fw";
+      url = "path:./mac-brcm-fw";
       flake = false;
     };
   };
diff --git a/mac-brcm-fw/default.nix b/mac-brcm-fw/default.nix
new file mode 100644
index 0000000..0537c32
--- /dev/null
+++ b/mac-brcm-fw/default.nix
@@ -0,0 +1,3 @@
+{ ... }: {}
+
+# dummy