Build ERROR

Author: MotorTruck1221

src/pages/games/index.astro

@@ -16,7 +16,6 @@ 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)"
@@ -40,7 +39,6 @@ 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>