change post.html
change post.html and duoshuo.html
fix conflicts