confusion 2
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	r1.txt
r2