Kanye West and Wiz Khalifa have put THAT Twitter spat behind them

Rappers make up following vile exchange over social media last week