amending commits to hide bugs in the git history may cause junk to appear when you trigger a merge conflict