Newcastle Show organisers end dispute with ride operators