Update MAINTAINERS.md to finish release process manually

MAINTAINERS.md

@@ -12,6 +12,18 @@ To do a release X.Y.Z do the following steps:
 2. edit `ChangeLog` and rename it to TAGMESSAGE`
 3. `make complete-release VER=vX.Y.Z ACCESS_TOKEN=<your-secret-key>`
 
+If you encountered merge conflicts, you need to fix them first and 
+then proceed manually:
+
+> Below assumes you are on `master` after merging the branch
+> `prepare_${VER}`.
+
+1. Create a tag: `git tag -f -s ${VER} -F TAGMESSAGE`
+2. Un-protect the `master` branch: `python3 tests/scripts/protect-un-protect.py master`
+  Make sure the output says `Successfully removed protection of master`
+3. Push to `master`: `git push origin master --tags`
+4. Re-protect the `master` branch: `python3 tests/scripts/protect-un-protect.py master`
+5. Finish the release: `make -f release.mk finish-release VER=vX.Y.Z` 
 
 If for some reason you encounter an error in any of the stages, you can
 do: