diff --git a/faq.html b/faq.html
index ade2181..f112260 100644
--- a/faq.html
+++ b/faq.html
@@ -5,6 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>FAQ</title>
+    <link rel="stylesheet" href="css/text.css">
 </head>
 <body>
     <header>
diff --git a/where_to_go.html b/where_to_go.html
index 837025d..2750d44 100644
--- a/where_to_go.html
+++ b/where_to_go.html
@@ -10,11 +10,8 @@
         <nav class="B">
             <a href = "main.html">Main Page</a>
             <a href = "where_to_go.html">Where To Go</a>
-<<<<<<< HEAD
             <a href = "history_mythology.html">History and Mythology</a>
-=======
             <a href = "history_mythology.html">History</a>
->>>>>>> 7b55c056e680e35408f53eb448d6cd0881856a11
             <a href = "food_lifestyle.html">Food and Lifestyle</a>
             <a href = "faq.html">Frequently Asked Questions</a>
 </nav>
