diff --git a/Justfile b/Justfile
index 907283f..a91c0e4 100644
--- a/Justfile
+++ b/Justfile
@@ -84,4 +84,10 @@ regen-migrations migration_name commit_hash='':
 clean:
     mix clean
     rm -rf .elixir_ls
-    rm -rf _build
\ No newline at end of file
+    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' {} \;
\ No newline at end of file