Fix more conflicts