merge conflict fail