in feature1 branch
commit in master branch
Merge branch 'feature1'

Conflicts:
	README.md
in feature1 branch
commit in main branch
Merge branch 'feature1'

Conflicts:
	README.md

final commit in master branch