added socket
merging