fixing merge

whoops