fixed git merge stuff that was put in web.xml again