Merge branch 'Branch1' into Branch2
r
asd
Merge branch 'Branch2'

Conflicts:
	filesample.txt