Basic static pages
forced
resolve conflict
merging