solved merge conflict with web.config