resolved master page conflict