method 3
Merge branch 'master'
change 7