msg
abc
Merge branch 'master' of https://github.com/jiechenqzm/self-project

Conflicts:
	test2.java