Single line upsteam rebase