three new files
file1 and file2 modified
3 files changed
file4 added
file3 and file4 changed
file1 modified by 'experimental'
file2 changed by master
Merge branch 'experimental'
new change in file1 by experimental
file1 modified by master now
Merge branch 'experimental'

Conflicts:
	file1