merge conflict test