added server status busy
solved merge conflicts