Dragonair ends fight over China routes