remove more conflict