Inserted text In list group item (close to footer)

app/Views/welcome_message.php

@@ -271,7 +271,6 @@
 
     <!-- Start Counter -->
     <section class="counters" id="counter">
-<<<<<<< HEAD
         <div class="container">
             <div class="row">
 
@@ -279,7 +278,6 @@
                     <div class="heading-area">
                         <h4 class="heading wow slideInLeft">Float analytical, recommendation/rewards framework</h4>
                     </div>
-
                     <ul class="list-group">
                         <li class="list-group-item">Our platform analyzes current fleet behavior and display areas for improvement on our custom customer dashboard.</li>
                         <li class="list-group-item">We provide immediate and longer term changes to improve fleet performance.</li>
@@ -293,8 +291,8 @@
                 </div>
             </div>
         </div>
-=======
-		<div class="container">
+
+		<!--div class="container">
 			<div class="row">
 
 				<div class="col-6 col-lg-6" style="text-aligh:right;">
@@ -313,8 +311,8 @@
 				    <img src="/float-ev/images/fleet-tree.jpg" alt="service-img">
 				</div>
 			</div>
-		</div>
->>>>>>> 7e4f1b0f0cdc2136481fb021c5a9bc1ac0648385
+		</!--div-->
+
     </section>
     <!-- End Counter -->