rebase with stable branch