refact pages
refactor
merge
resolve conflict