a conflicting edit on m2 branch
4th line added
vf
Merge branch 'master' of https://github.com/slartibardfarst/TestBranching

Conflicts:
	source.txt