userB write userA-file1.txt
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	userA-file1.txt