ico added to pages
conflicts resolved