This is my second commit
This is my third commit
This is my fourth commit (but the first on the experimental branch)
This is my fourth commit on the master branch
Merge branch 'experimental'

Conflicts:
	n.txt
Experimental Commit
Merge branch 'experimental'