Test merge conflict