testing out rebasing in gitflow