yay, far better, perform the rebase preserving local merges!