Did Diddy make nice with UCLA football?