try to merge
merge
local modify
update
auto merge
Merge branch 'master' of https://github.com/liuzelei/TLMedicalDataCenter.EMRQC