set up sitemesh3
conflict resolved