Fix some merge derps