idea 1
master 1
Merge branch 'idea'

Conflicts:
	file3.txt
master next