Ah, wrong conflict resolution.