Added Lines
Line Deleted
Merge branch 'NewBranch'

Conflicts:
	TestFile.txt