git checkout merge
git pull https://gitee.com/dataflux/dataflux-template.git add-icon-cassandra
git push origin merge
