add new Servlet
resolve conflicts