update from server
merge