Fix more merge bugs