The two families have ______ their disagreements in a friendly way, and this is what all of us expected to see.

A．settled	B．solved
C．defeated	D．overcame