Added another Servlet for testing
Fixed Conflicts