Fix layout.html

Author: Dhruvi16

themes/vocabulary_theme/templates/layout.html

@@ -172,17 +172,12 @@
         </ul>
       </nav>
     </div>
-<<<<<<< HEAD
   {% endif %}
 
   <!-- Body -->
   {% block body %}{% endblock %}
 
   <!-- Footer -->
-=======
-  </div>
-
->>>>>>> bcd4f549329a5712d949d18fe9e317b18c2ac1a9
   <footer class="main-footer">
     <div class="container">
       <div class="columns">