updated sitegenerator
fixed merge conflict