@jon-wei The conflicts has been resolved, but travis was failed, the error seems not relevant: [log](https://travis-ci.org/apache/incubator-druid/builds/429402314?utm_source=github_status&utm_medium=notification)
[ Full content available at: https://github.com/apache/incubator-druid/pull/5997 ] This message was relayed via gitbox.apache.org for [email protected]
