fixed mismerge from previous commit