were olivia and joshua dating in season 2