[client] fix a sync bug after multiple merges.