don't trigger trait on flying or allied unit
custom cursor support
merge