develop: 6
feature4: 1
Merge branch 'feature4' into develop

Conflicts:
	file1.txt
Merge branch 'develop'