combined sockets and binary
fixed merge conflicts
fixed merge conflicts