Three
Four
Merge branch 'developer'

Conflicts:
	example.txt