## file committed by userA
##UserB changed the newfile
Merge branch 'master' of https://github.com/tmlingam/projecta

Conflicts:
	newfile
mytree merged