冲突消解及重连
Merge branch 'master' of https://github.com/zhangsw/DistributedSharedMemory