Deliberate merge conflict