change user 2
Merge remote-tracking branch 'origin/Test'

Conflicts:
	file1.txt