changed file
Update file.txt
Merge branch 'test'

Conflicts:
	file.txt