2Second editing the same newfile.txt2Second editing the same newfile.txt
Merge branch '2Second' into SecondBranch

Conflicts:
	newfile.txt