Fixing web.xml post merge