feature1 branch change notice.txt
branch master change notice.txt
merge notice.txt