New headline and toc styles
fix comment
resolve conflict