re-branch from current upstream version