лодорпд‘‘
Merge branch 'br1'

Conflicts:
	src/file
Merge remote-tracking branch 'origin/master'