fix a couple bad lines in previous commit from bad merge attempt