this is a file commits
new modify
another modify
Merge branch 'experimental'

Conflicts:
	file1

merge success