i think when in doubt rebasing is an approach i apply frequently, i can restart them unless you've tried that already