FIX error while merging web.xml