bug fix
Merge branch 'experiment'
master fix
Merge branch 'experiment'

Conflicts:
	file1.txt
new feature master
conflict fix
Update file1.txt
conflict
fix
merge
hotfix commit
merge master into experiment