The pop stars shared a hug and conversation, signaling an end to years of rumored tension stemming from a past love triangle.
