Commit with -a option and conflict
Merge branch 'TestBranch' of https://github.com/PavelRPavlov/TestRepository into TestBranch

Conflicts:
	FileAddedInTestBranch.txt
fdas