do rebase
rebase master
rebase over