Server startup
fixed merge