update 2012-07-07-this-is-the-first-article.markdown
fix a bug in rebase with upstream action