diff --git a/overlays/default.nix b/overlays/default.nix
index d78dd8b..86d5316 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -13,6 +13,7 @@
     brave = prev.brave.override {
       commandLineArgs = "--password-store=gnome-libsecret";
     };
+<<<<<<< Updated upstream
     OVMF = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.OVMF;
     auto-cpufreq = inputs.nixpkgs-2744d98.legacyPackages.${prev.system}.auto-cpufreq;
     # hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: {