added --rebase to update to avoid problems with dirty modules