try again at merge conflict resolve