Fix potential merge conflicts

This fixes merge conflicts that will happen when
AirTerminal:SingleDuct:ConstantVolume:Reheat,
AirTerminal:SingleDuct:VariableVolume:NoReheat, and
EvaporativeFluidCooler:SingleSpeed are merged together.