dsfdsf
from br2 1
from br 2
Merge ktery bude oddelan
Merge branch 'br2'

Conflicts:
	a.txt
	b.txt