Completely resolve merge conflicts