đ
abc
Merge remote-tracking branch 'remotes/origin/branch2' into branch1

Conflicts:
	test1.txt