fixing rspec
finished static pages
resolve conflict after static pages