rebase for ex template