update before rebase