aviation conflicts