first commit
second commit
third commit
fourth commit
post-checking-out
new branch and lines
another new line, part 2
try this again
and again
aaaaand again
fixed
Merge branch 'newBranch'
Merge branch 'newParagraph'
Ok, resolved the conflicts here

Conflicts:
	file1
	file2
Merge branch 'master' of https://github.com/tCubed/codebase