solving question 7(modification)
Merge remote-tracking branch 'origin/master'