fixed minor pages
conflicts resolved