Пример коммита в ветку educational
commit N2
new branch!
Merge branch 'origin/branch_1'

Conflicts:
	testfile.txt