вторая ветка
Merge branch 'SecondBranch'

Conflicts:
	newBranchFile.txt
кпва
Merge branch 'testBranch'

Conflicts:
	newBranchFile.txt
ывасы