change in a branch
Merge branch 'branch1'

Conflicts:
	main.cpp