merge with server version