fix wrong rebase merge