rebase onto new BRAVO manifest