fixed migration rebasing order