diff --git a/flake.lock b/flake.lock
index 0953795..0f205ab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -175,11 +175,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1752480373,
-        "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
+        "lastModified": 1752644555,
+        "narHash": "sha256-oeRcp4VEyZ/3ZgfRRoq60/08l2zy0K53l8MdfSIYd24=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08",
+        "rev": "9100a4f6bf446603b9575927c8585162f9ec9aa6",
         "type": "github"
       },
       "original": {
diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index fbfe458..6f44085 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -60,7 +60,7 @@ in
         # FIXME: fetch prune/pruneTags?
         # FIXME: pull.rebase=true? Probably true TBH
         # FIXME: push.default=simple? Probably true TBH
-        # FIXME: conflict style? ui.conflict-marker-style=git is diff3/zdiff3
+        # FIXME: conflict style? ui.conflict-marker-style=git is diff3, not zdiff3. Default looks fine-ish
 
         # FIXME: from ma_9's config, plus my own stuff
         # snapshot = {