introduces a conflicting change
introduce a conflicting change on the master branch
Merge branch 'conflicting_branch'

Conflicts:
	Food/fruits.txt