patch up a/the/(one's) quarrel
To resolve or reconcile some dispute, disagreement, or conflict between two or more people or groups. It is not our responsibility to patch up a quarrel between two other countries—let them sort it out themselves! I just hope they can patch up their quarrel before the project is due.