rebase: fix problem during a rebase with develop