plus

tri
Merge remote-tracking branch 'origin/my-branch' into my-branch

Conflicts:
	testovy.txt