new file added
rows removed
yep
Merge branch 'newBranch'

Conflicts:
	Test.txt