modify gitconfig by adding mergetool
resolve conflicts