Rebase neato problem