static pages
fix conflicts
static pages