为了消灭歧义，
Merge remote-tracking branch 'origin/master'