added a line to cause a conflict
new conflicts on master branch
kept conflicts branch changes
second conflict on conflict branch
master conflict commit
Merge branch 'conflict'

Conflicts:
	mfuncs.c