Added text 'second branch'
finished work in 2nd branch
Conflict resolved: branches are merged