line 5 conflict
Merge branch 'master' of https://github.com/gitautotest/hello-world1

Conflicts:
	File 1.TXT