bug fix

Conflicts:
	file1.txt