Pretty much yeah. He said he wanted to fight her to settle things and if he won she'd have to marry him. Then she accepted and said that if she wins he'd have to marry her this time.( Since she asked before )

Too bad they didn't show Kumagawa in his 20's. That I wanted to see. But I think that will be in the bonus chapter about him.