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

Conflicts:
	File A.txt