merge from remote server