git checkout master
git pull https://gitee.com/jamie-cui/TSB-agent.git cjm/fix-merge-conflict
git push origin master