Fix .gitignore for a doc-only project
(Hopefully) fix wrong header syntax for Markdown docs
Fix merge conflict