add bbb to branch1
add ccc on master
Merge branch 'branch1'

Conflicts:
	README.md