static-pages
Finish static pages
conflict reslove
rm swp file