——— in a friendly way,their quarrel came to an end A settlin