Fix merge conflict resolution
Fix merge conflict resolution

jbeezley/girder,Kitware/girder,girder/girder,manthey/girder,girder/girder,girder/girder,jbeezley/girder,kotfic/girder,Xarthisius/girder,girder/girder,manthey/girder,jbeezley/girder,kotfic/girder,RafaelPalomar/girder,adsorensen/girder,manthey/girder,data-exp-lab/girder,Xarthisius/girder,data-exp-lab/girder,Xarthisius/girder,jbeezley/girder,RafaelPalomar/girder,manthey/girder,adsorensen/girder,RafaelPalomar/girder,kotfic/girder,RafaelPalomar/girder,data-exp-lab/girder,kotfic/girder,adsorensen/girder,data-exp-lab/girder,adsorensen/girder,Xarthisius/girder,Kitware/girder,kotfic/girder,data-exp-lab/girder,RafaelPalomar/girder,adsorensen/girder,Xarthisius/girder,Kitware/girder,Kitware/girder