merge it to server