First file
Some message for the second commit
To put in there
Multi file change
Mid branch commit
Merge branch 'integration' into development

Conflicts:
	newfile.txt
Merge branch 'master' of github.com:anthonyikeda/jax