Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
develop: 1
feature1: 1
Merge branch 'feature1'

Conflicts:
	file1.txt