legion: fixing a stupid git merge bug
legion: fixing a stupid git merge bug

sdalton1/legion,chuckatkins/legion,StanfordLegion/legion,StanfordLegion/legion,StanfordLegion/legion,StanfordLegion/legion,sdalton1/legion,chuckatkins/legion,StanfordLegion/legion,chuckatkins/legion,StanfordLegion/legion,sdalton1/legion,sdalton1/legion,chuckatkins/legion,StanfordLegion/legion,chuckatkins/legion,sdalton1/legion,StanfordLegion/legion,sdalton1/legion,chuckatkins/legion,chuckatkins/legion