Added fix1

Conflicts:
	file1.txt