Show HN: GitBook Editor – Merge Conflict Resolution UI

This sounds awesome. I avoid merging things specifically because I never learned Git command line, and GitHub doesn't have a UI to deal with it.

excellent - we love Gitbook and are super excited any time we get new features.