diff --git a/doc/usage/markdown.md b/doc/usage/markdown.md
index eb2c8d4..11c96eb 100644
--- a/doc/usage/markdown.md
+++ b/doc/usage/markdown.md
@@ -6,6 +6,7 @@ Using Markdown in Pagure
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
 
 Pagure uses [Markdown syntax highlighting](https://daringfireball.net/projects/markdown/syntax) as the base for formatting comments in issues, pull requests, and in Markdown files in repositories. For basic formatting, Pagure follows common Markdown formatting, but it also has some unique syntax for more advanced formatting. This help page helps demonstrate how to use Markdown in Pagure.
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 
 
@@ -55,20 +56,26 @@ To create headings, you will use the `#` symbol before the text. The number of h
 ~~~~
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 =======
+=======
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
-&nbsp;
 
 ## Headers
 
-To create headings, you will use the `#` symbol before the text. The
-number of hashes before the text determines the header size.
+To create headings, you will use the `#` symbol before the text. The number of hashes before the text determines the header size.
 
-<pre><code># header1
+~~~~
+# header1
 ## header2
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 ### header3</code></pre>
 
 <hr />
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+### header3
+~~~~
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
 # header 1
 
@@ -76,6 +83,7 @@ number of hashes before the text determines the header size.
 
 ### header3
 
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
@@ -91,6 +99,8 @@ number of hashes before the text determines the header size.
 
 &nbsp;
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
 ## Styling
 
@@ -113,6 +123,7 @@ You can mark up text with bold, italics, or strikethrough.
     * Example: `**This text is the _most important thing ever_**`
     * Output: **This text is the _most important thing ever_**
 
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
@@ -124,20 +135,26 @@ You can mark up text with bold, italics, or strikethrough.
 =======
 &nbsp;
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
 ## Quoting
 
 You can show text as being quoted with the `>` character.
 
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
 =======
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
+=======
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 ~~~~
 Before merging this pull request, remember Clark Kent mentioned this:
 > Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago.
 ~~~~
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 
 Before merging this pull request, remember Clark Kent mentioned this:
@@ -232,54 +249,58 @@ parentheses `( )` immediately after.
 Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after.
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 =======
+=======
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
 Before merging this pull request, remember Clark Kent mentioned this:
-> Double-check there's no reference to the Kryptonite library in the
-> program since we removed that a few versions ago.
+> Double-check there's no reference to the Kryptonite library in the program since we removed that a few versions ago.
 
-&nbsp;
 
 ## Code
 
-You can highlight parts of a line as code or create entire code blocks in
-your Markdown documents. Text inside of backticks will not be formatted.
-
-<pre>When running the program for the first time, use `superman --initialize`.</pre>
+You can highlight parts of a line as code or create entire code blocks in your Markdown documents. You can do this with the backtick character (`). Text inside of backticks will not be formatted.
 
+~~~~
 When running the program for the first time, use `superman --initialize`.
+~~~~
 
-&nbsp;
+When running the program for the first time, use `superman --initialize`.
 
-To format multiple lines of code into its own block, you will need to use
-raw HTML with the &lsaquo;pre&rsaquo;&lsaquo;/pre&rsaquo; tags.
+To format multiple lines of code into its own block, you can wrap the text block with four tilde (~) characters
 
-<pre>Install the needed system libraries:
-&lsaquo;pre&rsaquo;
+~~~~
+Install the needed system libraries:
+`~~~~`
 sudo dnf install git python-virtualenv libgit2-devel \
                  libjpeg-devel gcc libffi-devel redhat-rpm-config
-&lsaquo;pre&rsaquo;</pre>
+`~~~~`
+~~~~
 
-&nbsp;
 
 Install the needed system libraries:
-<pre>
+
+~~~~
 sudo dnf install git python-virtualenv libgit2-devel \
                  libjpeg-devel gcc libffi-devel redhat-rpm-config
-</pre>
+~~~~
 
-&nbsp;
 
 ## Hyperlinks
 
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 Need to embed a link to somewhere else? No problem! You can create an in-
 line link by wrapping the text in `[ ]` and appending the the URL in
 parentheses `( )` immediately after.
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+Need to embed a link to somewhere else? No problem! You can create an in-line link by wrapping the text in `[ ]` and appending the the URL in parentheses `( )` immediately after.
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
 `Pagure is used by the [Fedora Project](https://fedoraproject.org).`
 
 Pagure is used by the [Fedora Project](https://fedoraproject.org).
 
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
@@ -312,18 +333,27 @@ You can make unordered lists spanning multiple lines with either `-` or `*`.
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 =======
 &nbsp;
+=======
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
 ## Lists
 
-You can make unordered lists spanning multiple lines with either `-` or
-`*`.
+#### Unordered lists
 
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <pre>* Superman
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+You can make unordered lists spanning multiple lines with either `-` or `*`.
+
+~~~~
+* Superman
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 * Batman
     * Protector of Gotham City!
 * Superwoman
 * Harley Quinn
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
@@ -339,6 +369,10 @@ You can make unordered lists spanning multiple lines with either `-` or
 =======
     * Something on this list is unlike the others...</pre>
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+    * Something on this list is unlike the others...
+~~~~
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
 * Superman
 * Batman
@@ -347,6 +381,7 @@ You can make unordered lists spanning multiple lines with either `-` or
 * Harley Quinn
     * Something on this list is unlike the others...
 
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
@@ -376,12 +411,21 @@ You can make ordered lists by preceding each line with a number.
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 =======
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+#### Ordered lists
+
+You can make ordered lists by preceding each line with a number.
+
+~~~~
+1. Superman
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 2. Batman
     1. Protector of Gotham City!
     2. He drives the Batmobile!
 3. Superwoman
 4. Harley Quinn
     1. Something on this list is unlike the others...
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
@@ -397,6 +441,10 @@ You can make ordered lists by preceding each line with a number.
 =======
     2. Somebody evil lurks on this list!</pre>
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+    2. Somebody evil lurks on this list!
+~~~~
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
 1. Superman
 2. Batman
@@ -407,6 +455,7 @@ You can make ordered lists by preceding each line with a number.
     1. Something on this list is unlike the others...
     2. Somebody evil lurks on this list!
 
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
@@ -456,39 +505,28 @@ If you need to tag an issue or pull request that is outside of the current proje
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 =======
 &nbsp;
+=======
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
 ## Tagging users
 
-You can tag other users on Pagure to send them a notification about an
-issue or pull request. To tag a user, use the `@` symbol followed by their
-username. Typing the `@` symbol in a comment will bring up a list of users
-that match the username. The list searches as you type. Once you see the
-name of the person you are looking for, you can click their name to
-automatically complete the tag.
+You can tag other users on Pagure to send them a notification about an issue or pull request. To tag a user, use the `@` symbol followed by their username. Typing the `@` symbol in a comment will bring up a list of users that match the username. The list searches as you type. Once you see the name of the person you are looking for, you can click their name to automatically complete the tag.
 
 `@jflory7, could you please review this pull request and leave feedback?`
 
-[@jflory7](https://pagure.io/user/jflory7), could you please review this
-pull request and leave feedback?
+[@jflory7](https://pagure.io/user/jflory7), could you please review this pull request and leave feedback?
 
-&nbsp;
 
 ## Tagging issues or pull requests
 
-In a comment, you can automatically link a pull request or issue by its
-number. To link it, use the `#` character followed by its number. Like
-with tagging users, Pagure will provide suggestions for issues or pull
-requests as you type the number. You can select the issue in the drop-down
-to automatically tag the issue or pull request.
+In a comment, you can automatically link a pull request or issue by its number. To link it, use the `#` character followed by its number. Like with tagging users, Pagure will provide suggestions for issues or pull requests as you type the number. You can select the issue in the drop-down to automatically tag the issue or pull request.
 
-If you need to tag an issue or pull request that is outside of the current
-project, you are also able to do this. For cross-projects links, you can
-tag them by typing `<project name>#id` or `<username>/<project name>#id`.
+If you need to tag an issue or pull request that is outside of the current project, you are also able to do this. For cross-projects links, you can tag them by typing `<project name>#id` or `<username>/<project name>#id`.
 
-&nbsp;
 
 ## Emoji
 
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 >>>>>>> Add documentation for using Markdown in Pagure
 Pagure natively supports emoji characters. To use emoji, you can use two
 colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by
@@ -502,11 +540,15 @@ Pagure natively supports emoji characters. To use emoji, you can use two colons 
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 =======
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+Pagure natively supports emoji characters. To use emoji, you can use two colons wrapped around the emoji keyword (`:emoji:`). Typing a colon by itself will bring up a list of suggested emoji with a small preview. If you see the one you're looking for, you can click it to automatically complete the emoji.
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 
 `I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:`
 
 I reviewed the PR and it looks good to me. :+1: Good to merge! :clapper:
 
+<<<<<<< 0e389d26d6d16167ecd4dbe881964058fbdd7daf
 <<<<<<< 5babdd5746cc3345502180b67c7f9ae56bdbb00f
 <<<<<<< 7a26dcdc244c554fdf467408143a0f7850f5d1cd
 <<<<<<< ad0b1fdbfeed4d3673342cdad9a43d4b22372fe1
@@ -534,3 +576,9 @@ Notice anything that can be improved in this documentation? Find a mistake? You 
 >>>>>>> Update file based on hotfix to staging, update documentation for code blocks
 =======
 >>>>>>> Add documentation for using Markdown in Pagure
+=======
+
+## Improve this documentation!
+
+Notice anything that can be improved in this documentation? Find a mistake? You can improve this page! Find it in the official [Pagure repository](https://pagure.io/pagure/blob/master/f/doc/usage/markdown.md).
+>>>>>>> Update file based on hotfix to staging, update documentation for code blocks