Change for branch A
Changes for branch master
Merge branch 'branchA'

Conflicts:
	file1.txt