Fixed some merge errors but not javax.servlet is missing?