on second thought, do force --rebase