IATA, GDS companies butt heads over merchandising capabilities