From d601408b08881d1b1fb047223e8eac7ec5daa911 Mon Sep 17 00:00:00 2001
From: zhiru <zhiru.zhu@zilliz.com>
Date: Wed, 29 May 2019 16:24:46 +0800
Subject: [PATCH] resolve merge conflicts

Former-commit-id: 47eee4d08cde0e6628cddff77de7809ebb486eaf