added javax.servlet dependency
committed conflicts