Changed to an 8
Added a line
Merge remote-tracking branch 'upstream/master'

Conflicts:
	test2.txt