change made in master-test
Merge branch 'merge-test'

Conflicts:
	file1.txt