Philadelphians rapper Meek Mill and Pastor Jomo K. Johnson appear to have ended their feud. Pastor Johnson took offense to Mill’s song “Amen,” and encouraged a boycott of the rapper over what he felt was a track meant to disrespect Christians. Mill addressed the controversy during an appearance on BET’s “106 & Park” and Johnson reacted thereafter.

“People find all types of stuff offensive,” Meek told Rocsi Diaz and Terrence J. “I don’t think no preacher or no church approve of any type of rap music — because rap music, period, is a lot of bad stuff said. But at the end of the day, it’s real life. And me, I wasn’t trying to disrespect no religion or anything like that. My whole family is Christian. I have a half Christian, half Muslim family. The situation, the song, that’s what energy it felt and if anybody feel disrespected, I ain’t do it in that way. And I ain’t drop the song with bad intentions. I did it just because it was a good feeling — that’s the feeling it gave me so I said, ‘Amen, church.’ I didn’t do it with bad intentions at the end of the day.”

Afterwards, the pastor declared his boycott over.

“This apology was the condition for lifting the Call-To-Action boycott,” Pastor Johnson said via statement. “Therefore, I want to say as a follower of Christ, that I completely forgive Robert Williams for this song because Jesus has completely forgiven me. While I have made the choice not to listen to or support any artist that promotes blasphemy or misogyny in their music, I appreciate Mr. Williams being willing to acknowledge his wrong. It is my sincere hope, that he, along with all popular rappers with their fans, will embrace God’s total forgiveness by turning from the sin promoted through mainstream Hip Hop, and trust solely in Christ for salvation. Christ died for all the evil we have done and spoken. And it is only through repentance and faith that forgiveness can be found. I want to say thanks to everyone who chose to cover this story, and a special thanks to all those who supported me.”