userA modify userA-file1.txt
Merge branch 'master' of github.com:aclove/TestProject

Conflicts:
	userA-file1.txt