Resolve implicit merge conflict