edit to doc1 in branch1.
added a line to doc5 in branch2.
Merge branch 'branch2'