develop commit 1
develop commit 2
test commit --
Merge branch 'test' into develop

Conflicts:
	com/test