manual rebase to master