fixed a merge error
fixed a merge error

larryprice/ollert,larryprice/ollert,leviwilson/ollert,sep/ollert,larryprice/ollert,nschmidtg/simpla,sep/ollert,leviwilson/ollert,nschmidtg/simpla,sep/ollert,leviwilson/ollert,nschmidtg/simpla