pull from server
merge