commit edited web.config
merge conflicted web.config