Remove more conflict flags

Missed some conflict flags