another conflict test
Merge branch 'conflictbranch' into otherbranch

Conflicts:
	test.c