master add "master change"again
Revert "master add "master change"again"

This reverts commit 58dd86d62185308de85920c4528e4550c8e1d1fd.
branch2 add "this is branch2"
branch1 add "this is branch1"
Merge branch 'branch2'
Merge branch 'branch1'