Tools to help with git merges