add t4 blog
odify merge conflict