fix conflict in pelicanconf.