merge conflict update