I'd say just nuke it and then rebase this commit into one.