Make merge conflict