Want an merge conflict