diff --git a/.envrc b/.envrc
index 04508df..0f74252 100644
--- a/.envrc
+++ b/.envrc
@@ -4,8 +4,10 @@ git config --local core.hooksPath "$PWD"/.githooks
 test -d .direnv || mkdir -p .direnv
 now="$(date +%Y-%m-%d)"
 if ! test -s .direnv/pull-date || test "$now" != "$(cat .direnv/pull-date)"; then
-  git checkout -- flake.lock
+  git reset flake.lock
+  git restore flake.lock
   git pull --rebase --autostash
+  grep -q "^=======" flake.lock && { git reset flake.lock; rm flake.lock; }
   nix flake update
   #nix flake lock \
   #  --update-input nixpkgs \