fixed merge conflcist in master page