fix(conflicts): Fixed merge conflicts

Author: aanchal-fatwani

about.html

@@ -245,7 +245,6 @@ <h4>Join Our Newsletter</h4>
     <script src="js/main.js"></script>
     <script src="js/preloaderjs.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
 
     </body>
     </html>

about1.html

@@ -726,7 +726,6 @@ <h4>Join Our Newsletter</h4>
     <script src="js/main.js"></script>
     <script src="js/preloaderjs.js"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
 
 </body>
 

contact.html

@@ -282,8 +282,6 @@ <h4>Join Our Newsletter</h4>
   <script src="js/google-map.js"></script>
   <script src="js/main.js"></script>
   <script src="js/preloaderjs.js"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-  
 
   </body>
   </html>

index.html

@@ -55,7 +55,6 @@
        <ul class="navbar-nav ml-auto">
          <li class="nav-item active"><a href="index.html" class="nav-link">Home</a></li>
          <li class="nav-item"><a href="about.html" class="nav-link">About</a></li>
-         <li class="nav-item"><a href="team.html" class="nav-link">Our Team</a></li>
          <li class="nav-item"><a href="blog.html" class="nav-link">Blog</a></li>
          <li class="nav-item"><a href="contact.html" class="nav-link">Contact</a></li>
      </ul>
@@ -202,103 +201,6 @@ <h3>Artificial Intelligence</h3>
 </div>
 
 
-<!-- Mentors  -->
-
-
-<section class="ftco-section bg-light">
-  <div class="container">
-    <div class="row justify-content-center pb-4">
-      <div class="col-md-12 heading-section text-center ftco-animate">
-        <span class="subheading">Our Strength</span>
-        <h2 class="mb-4">Our Mentors</h2>
-      </div>
-    <div class="row">
-      <div class="col-md-6 col-lg-3 ftco-animate d-flex align-items-stretch">
-        <div class="staff">
-          <div class="img-wrap d-flex align-items-stretch">
-            <div class="img align-self-stretch" style="background-image: url(images/team/atulya.webp);"></div>
-          </div>
-          <div class="text pt-3">
-            <h3>Atulya Bhatheja</h3>
-            <span class="position mb-2">Mentor</span>
-            <div class="faded">
-              <p>Data Science | Business Analytics | Intern @The Sparks Foundation</p>
-              <ul class="ftco-social text-center">
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-twitter"></span></a></li> -->
-                <li class="ftco-animate"><a href="https://www.linkedin.com/in/atulya-bhatheja-81451719b/"><span class="fa fa-linkedin"></span></a></li>
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-google"></span></a></li> -->
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-instagram"></span></a></li> -->
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="col-md-6 col-lg-3 ftco-animate d-flex align-items-stretch">
-        <div class="staff">
-          <div class="img-wrap d-flex align-items-stretch">
-            <div class="img align-self-stretch" style="background-image: url(images/team/saumya.webp);"></div>
-          </div>
-          <div class="text pt-3">
-            <h3>Saumya Rawat</h3>
-            <span class="position mb-2">Mentor</span>
-            <div class="faded">
-              <p>Artificial Intelligence | Data Structures | Competitive Programming</p>
-              <ul class="ftco-social text-center">
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-twitter"></span></a></li> -->
-                <li class="ftco-animate"><a href="https://www.linkedin.com/in/saumya-rawat-8b59081a8/"><span class="fa fa-linkedin"></span></a></li>
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-google"></span></a></li> -->
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-instagram"></span></a></li> -->
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="col-md-6 col-lg-3 ftco-animate d-flex align-items-stretch">
-        <div class="staff">
-          <div class="img-wrap d-flex align-items-stretch">
-            <div class="img align-self-stretch" style="background-image: url(images/team/sai.webp);"></div>
-          </div>
-          <div class="text pt-3">
-            <h3>Sai Harsha Vardhan A.V.N</h3>
-            <span class="position mb-2">Mentor</span>
-            <div class="faded">
-              <p>Java | RDMS | DBMS | MySQL | Mongodb</p>
-              <ul class="ftco-social text-center">
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-twitter"></span></a></li> -->
-                <li class="ftco-animate"><a href="https://www.linkedin.com/in/sai-harsha-vardhan-a-v-n-780816178/"><span class="fa fa-linkedin"></span></a></li>
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-google"></span></a></li> -->
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-instagram"></span></a></li> -->
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="col-md-6 col-lg-3 ftco-animate d-flex align-items-stretch">
-        <div class="staff">
-          <div class="img-wrap d-flex align-items-stretch">
-            <div class="img align-self-stretch" style="background-image: url(images/team/rohit.webp);"></div>
-          </div>
-          <div class="text pt-3">
-            <h3>Rohit Sharma</h3>
-            <span class="position mb-2">Mentor</span>
-            <div class="faded">
-              <p>Data Science | Big Data | Business Analytics</p>
-              <ul class="ftco-social text-center">
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-twitter"></span></a></li> -->
-                <li class="ftco-animate"><a href="https://www.linkedin.com/in/rohit-sharma-0389491b0/"><span class="fa fa-linkedin"></span></a></li>
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-google"></span></a></li> -->
-                <!-- <li class="ftco-animate"><a href="#"><span class="fa fa-instagram"></span></a></li> -->
-              </ul>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    </div>
-  </div>
-</div>
-</section>
-
 
 <!-- Blog Section  -->
 
@@ -407,7 +309,6 @@ <h4>Useful Links</h4>
             <ul>
               <li><i class="bx bx-chevron-right"></i> <a href="index.html">Home</a></li>
               <li><i class="bx bx-chevron-right"></i> <a href="about.html">About us</a></li>
-              <li><i class="bx bx-chevron-right"></i> <a href="team.html">Our Team</a></li>
               <li><i class="bx bx-chevron-right"></i> <a href="blog.html">Blog</a></li>
             </ul>
           </div>