Added building fleets
Fixed merge errors