The boxer wants to bring a bitter rivalry to a permanent end.