merge english chat server code