migration to eclipse internal tomcat server
Conflict solution