Confl
Confl 1
Merge branch 'b'

Conflicts:
	functions.c