settling the dispute

• solving the controversy, settling the argument