merge from server