test conflict with other branch
test conflict by deleting a line

Merge branch 'hotfix'

Conflicts:
	TestGit/src/test/Hello.java
Merge branch 'master' of https://github.com/AnDongLi/testGit
comment a line to test pull merge