fixes a error I made when merging.