fix for bad rebase