Fix more merge errors