Adding a conflict
Merge remote-tracking branch 'origin/develop' into feature/bug3

Conflicts:
	bug4.tpt