Your rebase is stuck with conflicts, and new commits accidentally built on the wrong base branch. Fix the situation without losing work.