commit user changes
commit resolved conflit in webconfig