settled a dispute

• found a solution to an argument, settled difficulties