added conflict.txt
Merge branch 'master' into my-temp-work

Conflicts:
	conflict2.txt