Add a note on how to revert a faulty git merge