Features should rebase on finish