change by B
Merge pull request #2 from ElvisYang/branch-B

change by B
change in A first
change by A second