test commit 1
Test commit 2: changes in file1.cc
Merge branch 'fmtest'

Conflicts:
	file1.cc