修改文件，测试分支提交
Merge remote-tracking branch 'origin/test_merge'

Conflicts:
	src/main/java/com/ctrip/search/mystest/sort/TestGitMergeMaster.java