re-resolve merge conflicts