commit test for merge conflict?