[haiyang] fix the merge conflict