decades old dispute ends