fixed merge conflict
merging
Merge branch 'master' of https://github.com/mxpan/virtualspace