use rebasing to deploy the right thing