Resolve conflict format
Resolve conflict format

WakelessDragon/blog,digoal/blog-1,Thrashmandicoot/blog,gnyuan/gnyuan.github.io,pischolar/pischolar.github.io,Thrashmandicoot/blog,dubuyuye/blog,digoal/blog-1,cmxiaocai/blog,cmxiaocai/blog,foojay/blog-1,pischolar/pischolar.github.io,songzuotao/blog,foojay/blog-1,gnyuan/gnyuan.github.io,WakelessDragon/blog,songzuotao/blog,dubuyuye/blog