Merge "Revert "Fleetify nova conductor for N cells""