Added a 2 at the end of the second line of "Main Branch Commit.txt"
Merge branch 'testbranch'

Conflicts:
	Main Branch Commit 1.txt