fixed a merge conflict that wouldn't allow me to serve the site locally