update httpServer merged with squash