fix specs after rebase