added anotherFile
added content to anotherFile
Changed contents for anotherFile in newBranch
Merge branch 'yetAnotherBranch'

Conflicts:
	anotherFile
Fixed bad merge file