Removing more conflict flags