implement dying across network
fix merge conflict