Farah and John Paul...missed it

She says he has to at least give her an answer ("yes" or "no") about marriage and of course he doesn't so she breaks up with him. At the end of the episode, he tells her that he will marry her "someday" and they get back together.