Will rebasing help?