The WWE and boxing stars, respectively, waged a public feud back in 2017 but have since reconciled.