Create b1-file
Create master-file
Merge branch 'b1'
Create conflict file
Add line to conflict-file
Add line to conflict-file
Resolve conflict