diff --git a/modules/cli/vcs/jj.nix b/modules/cli/vcs/jj.nix
index d677c9d..ffd5695 100644
--- a/modules/cli/vcs/jj.nix
+++ b/modules/cli/vcs/jj.nix
@@ -26,6 +26,7 @@ lib.my.makeHomeProgramConfig {
           ui = {
             graph.style = "square";
             default-command = "status";
+            conflict-marker-style = "snapshot";
           };
           signing = {
             backend = "ssh";