where_to_go.html

@@ -11,10 +11,7 @@
             <a href = "main.html">Main Page</a>
             <a href = "where_to_go.html">Where To Go</a>
             <a href = "history_mythology.html">History and Mythology</a>
-<<<<<<< HEAD
-=======
             <a href = "history_mythology.html">History</a>
->>>>>>> dcb9e092b0a387daf99d10ef8f485deb7b5c7300
             <a href = "food_lifestyle.html">Food and Lifestyle</a>
             <a href = "faq.html">Frequently Asked Questions</a>
 </nav>