delete title <h1>,paste title <title>

delete title <h1>,paste title <title>
Merge commit 'ebd24625ae37ec3022cafbed51df9d6578b1f277'

* commit 'ebd24625ae37ec3022cafbed51df9d6578b1f277':
  delete title <h1>,paste title <title>

Conflicts:
	index.html