fix merge conflict
Merge branch 'master' of bitbucket.org:twinbrother/wp-blankslate-theme

* 'master' of bitbucket.org:twinbrother/wp-blankslate-theme:
  fix merge conflict