Allow for server to be run via apache
fixed merge conflict