pridal som text

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

Conflicts:
	jgfdjgfc.txt