Fixed handle dead
added handle Dead server
Fixed merge conflict