added branch-3
added branch-3-1
added branch-3-2
resolved conflict
Merge branch 'branch-3'