Added fix1
Added fix2
Added fix1

Conflicts:
	file3.txt
merged