does olivia get calvin back