fixed merge conflict in sockets.js
fixed merge conflict in sockets.js

natelevine/spazzinglicorice,SunyoungKim508/spazzinglicorice,PulseLabs/spazzinglicorice,PulseLabs/spazzinglicorice,SunyoungKim508/spazzinglicorice,natelevine/spazzinglicorice