Fixed client connection to server issue from file merge.