The beef between Drake and Tory Lanez is no more. Both rappers posed for a photo together and addressed their past feud.

The city needs more of this and less of that. 6️⃣

A post shared by champagnepapi (@champagnepapi) on May 18, 2017 at 4:32pm PDT

Toronto... I Told You @Midjordan

A post shared by torylanez (@torylanez) on May 18, 2017 at 4:10pm PDT

Both rappers have been trading shots for a while, with the starkest attack coming when Tory dropped his 2015 mixtape The New Toronto. The title seemed to bother Drake, and he sent a few shots at Mr. Lanez in his song "Summer Sixteen."

Afterward, there were other subtle jabs between both rappers, and Tory working with Meek Mill certainly didn't help to end the feud.

But now all of that has changed, and it looks like Drake and Lanez want to come together for their city, which is pretty cool. Maybe we'll be hearing a collaboration soon.

☂️

A post shared by champagnepapi (@champagnepapi) on May 18, 2017 at 4:36pm PDT