remove more conflict files