[client] Fix a bug in merge.