merge esockd