adding branch
Merge branch 'my_branch'
resolving conflicts