fix bad rebase