remove flag conflict