merge the client file