A merge with conflict

Conflicts...