The Weeknd Makes Surprise Grammys Appearance, Beef with Recording Academy Over

A major beef ended at the Grammy Awards Sunday ... not between two artists, but between an artist and the academy itself -- 'cause The Weeknd is back in the Grammys fold. Harvey Mason Jr. -- the Recording Academy CEO -- stepped up to talk about all…