git conflict test
Merge remote-tracking branch 'origin/master'

Conflicts:
	github_file.txt
Merge branch 'master' of https://github.com/LiorNagar1/TestRepo

Conflicts:
	github_file.txt

Conflicts:
	github_file.txt