Update mvc-dispatcher-servlet.xml

fix after merge conflict