Conflict resolution.
Conflict resolution.

jprochazka/adsb-feeder,jprochazka/adsb-feeder,jprochazka/adsb-receiver,jprochazka/adsb-feeder,jprochazka/adsb-receiver,jprochazka/adsb-receiver,jprochazka/adsb-receiver,jprochazka/adsb-feeder,jprochazka/adsb-feeder,jprochazka/adsb-receiver