From Taylor and Katy to Paris and Nicole: Celebrities Who Made Up After Feuding