調整
調整
Merge branch 'A' into master_test
Merge branch 'B' into master_test