merge servlet changes