A simple web-based tool to resolve Git merge conflicts directly in your browser. - View it on GitHub