Fix more merge issues