commit for merge conflict