no more problems with respect to serving the homepage of the library
fixed merge conflict