Fix more conflict bugs