http://xkcd.com/1296/
Merge remote-tracking branch 'origin/master'