update blog
resolve conficts