Setup a personal access token for using GitHub repositories.
This post shows how you can resolve a merge conflict with git with the help of the open-source application KDiff3.
This post discusses how to resolve a Git merge conflict with the help of KDiff3 and analogies.
A repository access token for Bitbucket is simple to setup. You will find a little guide/refresher here.