changed basesockets.js
fixed merge conflicts