diff --git a/Justfile b/Justfile
index 3e3e764..876591d 100644
--- a/Justfile
+++ b/Justfile
@@ -86,6 +86,12 @@ clean:
     rm -rf .elixir_ls
     rm -rf _build
 
+# Remove Git merge conflict markers from gettext files
+remove-gettext-conflicts:
+  #!/usr/bin/env bash
+  set -euo pipefail
+  find priv/gettext -type f -exec sed -i '/^<<<<<<< HEAD$/d; /^=======$/d; /^>>>>>>>/d' {} \;
+
 # Production environment commands
 # ================================