Conflict resolution with flags