The rappers put last week’s memorable exchange behind them.

Last week, after confusing Wiz Khalifa’s reference to weed (“kk”) for a comment about his wife (“KK“), Kanye West went on a volcanic Twitter rant, at one point claiming “I own your child”. He has since apologized and resolved the conflict with Khalifa.

“Me and Wiz spoke yesterday. Great convo. All positive”, said West on Twitter. Khalifa’s confirmed their reconciliation to Power 105.

Me and Wiz spoke yesterday. Great convo. All positive.

— KANYE WEST (@kanyewest) February 2, 2016

West seems to have taken Khalifa’s original criticism (that he shouldn’t name his album Waves) to heart, judging by Kim Kardashian’s recent poll asking fans which of her husband’s three album titles they like most. They ended up picking the original — So Help Me God.

WAIT new poll. Which album title do you like best? @kanyewest

— Kim Kardashian West (@KimKardashian) February 1, 2016