merge with servlets