Airbus and Qatar Airways resolve A350 dispute