我新建了一个文件
Merge remote-tracking branch 'origin/master'

Conflicts:
	project-core/src/main/java/com/cm/project/core/TestNewClass4.java