code input - https://codeinput.com

A merge conflict resolution tool integrated with GitHub. Now working on a solution for preemptive conflict detection and a smarter/simpler merge queue.