prepare
merge with server