Added UI to resolve merge conflicts