still on branch idea2
Merge branch 'origin/idea2(idea3)' into idea2

Conflicts:
	file.txt