revert banner code

Author: anmol-algo

src/partials/main.hbs

@@ -4,17 +4,13 @@
 {{#if ./missing}}
 {{#if (and @root.page.componentVersion.prerelease (not ./prerelease))}}
 <div class="article-banner">
-<<<<<<< HEAD
 {{#if (and @root.page.componentVersion.prerelease (not @root.page.latest.prerelease))}}
 <i class="fas fa-file-alt"></i> <p>  You are viewing the documentation for a prerelease version.</p>
 {{else}}
 <i class="fas fa-file-alt"></i> 
 <p> A newer version of this documentation is available.</p>
 {{/if}}
 <a class="btn" href="{{relativize this}}">View Latest</a>
-=======
-<i class="fas fa-file-alt"></i> <p>You are viewing the documentation for a prerelease version.</p>
->>>>>>> 6f0d7c56aa847b17c98cef6ffa2595d15f6bc9df
 </div>
 {{/if}}
 {{else}}