I use GitKraken to only to resolve merge conflicts. Recently, they decided to make app unavailable for private repos.

Suggestions?

Set vscode as your merge/diff tool. It's capable enough.

Edit for config:

# Add this to you gitconfig
# Comment: Start of "Extra Block"
# Comment: This is to unlock VSCode as your git diff and git merge tool
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait $MERGED
[diff]
tool = vscode
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
# VSCode Difftool
## End of extra block

they made me learn git cli :/

I use the git client 'fork'.
git-fork.com