buffy returns from a trip to los angeles where she argued with angel