publish my blog
fix conflict