merge mistake, no errors now

not sure how this got pulled in