Author: leonshao
Description: 修复merge分支时的文件冲突
Author: leonshao
Description: 修复合并分支时的文件冲突