by the end of the movie , shepley had rejoined us , and the main character had figured out she had feelings for her roommate , she was n't an old cow after all , and the man-whore , now reformed , was angry about some stupid misunderstanding .