updated rebasing faqs