Fix leftover text from conflicted file

* remove leftover text from a git conflict
* change the presentation to include the header and footer