I've been and still working on code input (https://codeinput.com). A merge conflict resolution tool that integrates with GitHub. I'm close to move from an alpha to a beta and hopefully it'll be ready to launch in a couple months time. If you dread merge conflicts, or currently have a Pull Request stuck in a conflict state, give it a try. I should re-mention it is still in an alpha state and might bug out during the process.