Conor McGregor -- 'Me & Jesus Are Cool' ... Gods Recognize Gods

Memba when Conor McGregor said he could whoop Jesus Christ's ass in an MMA fight?

Well, seems the two have finally made peace.

McGregor was at the news conference for the UFC 197 fight against Rafael dos Anjos ... when a fan asked Raf if he was offended by Conor's comments, since he's a very religious guy.

Raf essentially says Conor will feel Jesus' wrath come fight time ... but Conor says he ain't worried, since he and JC are cool, bro.

It's pretty funny stuff.