add a base-template and rebase to it