5th change
6th change
7th change
a line changed in current branch
Merge branch 'testbranch'

Conflicts:
	main.cpp
8th change
Merge branch 'master' into testbranch

Conflicts:
	main.cpp