The famous feud between Floyd Mayweather Sr . and Floyd Mayweather Jr . finally came to an end as father and son made up before Jr . 's return to the ring after a 21-month lay off .
DET ADJ NOUN ADP PROPN PROPN PROPN PROPN CCONJ PROPN PROPN PROPN PROPN ADV VERB ADP DET NOUN ADP NOUN CCONJ NOUN VERB ADP ADP PROPN PROPN PART NOUN ADP DET NOUN ADP DET NUM NOUN ADP .