minor changes - started planning for fleets
conflict resolve