git mergetool

Open the git tool to fix conflicts