test merge direct
Merge branch 'abc' into abcd

Conflicts:
	New Text Document.txt