to patch up a dispute