Added fix1
Added Fix2
Added fix1

Conflicts:
	file1.txt
Merge fixed