Initial change and add
branch change
master branch change
Merge branch 'LocalBranch'

Conflicts:
	GitTest3.txt
delete file