stop the rebase madness -- branch edition