rebasing concurrent work