fix message
Merge branch 'master' of https://github.com/toofache/typo
fix merging articles