QQ
Merging..
asdf
Merge branch 'feature' into HEAD

Conflicts:
	test.txt
Clearing