Solve conflicts with configured merge tool

git mergetool

Note: Ensure you add or remove them after with the following

git add <resolved-file>
git rm <resolved-file>