branch1 commit2

added the second line to doc2 (possibly conflicting with branch2
commit1)