before merging with server