initial "resolve merge conflicts"