Resolve your conflicts directly from GitHub's UI · HackerTrans