For the woman put off by her old , I agree that the best solution would be for the roommate to change her ways, but leveling with her would more than likely end the friendship.
There is no conflict between the two roommates.