detached head commit
Merge branch 'develop' into detachedhead-branch

Conflicts:
	conflict.txt
Merge branch 'detachedhead-branch' into develop

Conflicts:
	conflict.txt