Fixed conflicts resulting from servlet merge