added more specific use of branch
Merge branch 'conflict-on-readme'