output fix
merage server code