avoid a merge conflict
avoid a merge conflict

mrakitin/sirepo,mkeilman/sirepo,radiasoft/sirepo,radiasoft/sirepo,mkeilman/sirepo,mkeilman/sirepo,mrakitin/sirepo,radiasoft/sirepo,mkeilman/sirepo,mrakitin/sirepo,mrakitin/sirepo,radiasoft/sirepo,radiasoft/sirepo