fix last conflict
add server simulation, but is it really necessary?