Oh noes a conflict
Add text so I can actually get a conflict
Merge remote-tracking branch 'origin/develop' into feature/bug2

Conflicts:
	conflict.txt