Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
develop12
Merge branch 'develop'

Conflicts:
	file.txt
commit to develop
commit to feature
commit to feature2
commit to master2
Merge branch 'feature'
change on feature2
add file to master
Edit on master
Merge branch 'feature2'

Conflicts:
	develop1.txt
add feature3
Merge branch 'feature3'
feature 4
change on master
Merge branch 'feature4'

Conflicts:
	develop1.txt