in develop branch
in feature1
in master branch
Merge branch 'develop'

Conflicts:
	README.md

master and develop
Merge branch 'feature1'

Conflicts:
	README.md

3