add h1 to section #1
remove h1s #1
fix conflicts #1