fixed up a mismerge