added new pages
remerge conflicts