A bitter quarrel between former premier Mahathir Mohamad and Trade Minister Rafidah Aziz that has captivated Malaysia was put to rest today as the pair shared a public and emotional embrace.