git checkout master
git pull https://gitee.com/panzhe0328/kyclassifier.git conflists
git push origin master