fix conflict3
Merge branch 'master' of https://github.com/LiorNagar1/TestRepo

Conflicts:
	github_file.txt