diff --git a/docs/abra/hack.md b/docs/abra/hack.md
index 943532e..c09a34a 100644
--- a/docs/abra/hack.md
+++ b/docs/abra/hack.md
@@ -220,7 +220,7 @@ bats -Tp tests/integration --filter-status failed # re-run only failed
 
 If you're running into issues and want to debug stuff, you can pass `-x` to `bats` to trace all commands run in the test. You can add `echo '...' >&3` debug statements to your test to output stuff also.
 
-## Internationalisation
+## Internationalisation (`i18n`)
 
 `abra` can be translated into other languages. We use a combination of [`gettext`](https://www.gnu.org/software/gettext/), [`weblate`](https://translate.coopcloud.tech) and some [intermediate automation](https://git.coopcloud.tech/toolshed/abra/src/commit/20909695e0e05c6251029dba270b3d4741aeb7a8/.drone.yml#L10-L29) to help developers and translators work together conveniently.
 
@@ -249,6 +249,16 @@ make i18n
 
 Commit the changes. Ignore `*.mo` changes if they only update the generation timestamp.
 
+#### Resolving a merge conflict
+
+```
+git remote add weblate https://translate.coopcloud.tech/git/co-op-cloud/abra/
+git remote update weblate
+git merge weblate/main
+```
+
+Once you've resolved the conflict and pushed it, you'll need admin permissions on the Weblate repository to unlock it.
+
 ### Translator workflow
 
 You can translate strings on [Weblate (`translate.coopcloud.tech`)](https://translate.coopcloud.tech).