update merge conflict