fix specs after giant merge