Conflict resolution with item flag