Fix more merge conflicts