The move follows a series of intense lyrical exchanges and public incidents, signaling a possible end to their long-standing feud.