handling merge conflict