WIP: Conflict resolution example