Hotfix: Games Page

Author: MotorTruck1221

src/pages/games/index.astro

@@ -16,6 +16,7 @@ import '../../styles/globals.css';
         <h1 class="get-started-text">Games</h1>
     </div>
     <div class="search-div">
+<<<<<<< HEAD
         <input
             type="text"
             oninput="search_games(this.value)"
@@ -39,6 +40,29 @@ import '../../styles/globals.css';
         <option value="shooter">Shooter</option>
         <option value="proxied">Proxied</option>
     </select>
+=======
+        <input type="text" oninput="search_games(this.value)" placeholder="Search For A Game..." class="search-input"></input>
+        <select class="search-select" onchange="category_games(this.value)">
+            <option value="">All</option>
+            <option value="arcade">Arcade</option>
+            <option value="platformer">Platformer</option>
+            <option value="static">Static</option>
+            <option value="racing">Racing</option>
+            <option value="flash">Flash</option>
+            <option value="adventure">Adventure</option>
+            <option value="multiplayer">Multiplayer</option>
+            <option value="retro">Retro</option>
+            <option value="emulation">Emulation</option>
+            <option value="sports">Sports</option>
+            <option value="strategy">Strategy</option>
+            <option value="shooter">Shooter</option>
+            <option value="proxied">Proxied</option>
+        </select>
+    </div>
+    <div class="games" id="games"></div>
+    <script src="/js/games.js" type="module" is:inline></script>
+    <script src="/js/searchGames.js" is:inline></script>
+>>>>>>> 433159c (Hotfix: Games Page)
 </body>
 <div class="games" id="games"></div>
 <script src="/js/games.js" type="module" is:inline></script>