resolve conflict in web.xml