diff --git a/Justfile b/Justfile
index a91c0e4..856036e 100644
--- a/Justfile
+++ b/Justfile
@@ -90,4 +90,4 @@ clean:
 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
+  find priv/gettext -type f -exec sed -i '/^<<<<<<</d; /^=======$/d; /^>>>>>>>/d; /^%%%%%%%/d; /^++++++/d; s/^+//' {} \;
\ No newline at end of file