Merge branch 'feature/foo'
Merge branch 'feature/bar'

Conflicts:
	my-cool-plugin.php
Added feature Blah

This featue does blah and blah and some more blah
Merge branch 'feature/blah' into develop

Conflicts:
	my-cool-plugin.php