make the code function more clear.
Merge remote-tracking branch 'origin/master'