Fix more merge derps