[...]???
Conflict resolution.