Abbott drops Texas challenge to airline merger