Version 1.5 introduces a new way to resolve merge conflicts ... If you’re tempted to check out GitHub Desktop, you can download it here. If it’s ultimately not to your liking, perhaps check ...

I notice that you have a github merge commit in there. That's another of those things that I *really* don't want to see - github creates absolutely useless garbage merges, and you should never ...