Conflict resolution (again)