REDO-STATIC-PAGES
fixed merge errors