The deal comes after an unusally public spat over payment rates that lasted for months.