diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php
index d80d272..23a1c1b 100644
--- a/app/Views/welcome_message.php
+++ b/app/Views/welcome_message.php
@@ -317,11 +317,8 @@
 
 
     <!--Clients Start-->
-<<<<<<< HEAD
-    <!--div class="container">
-=======
-    <!-- div class="container">
->>>>>>> bcc5077f2d53a3d6151c74d9fd3680af7743a82c
+   <!--div class="container">
+    
         <div class="row no-gutters">
             <div class="col-lg-3 col-md-12 col-sm-12 name">
                 <div class="client-img-holder rounded-circle center-block">
@@ -356,60 +353,59 @@
     </!--div>
 
     <!-Clients End-->
-=======
-    </!-->
-    <!--Clients End-->
->>>>>>> bcc5077f2d53a3d6151c74d9fd3680af7743a82c
+        
+        <!--Clients End-->
 
 
-    <!-- Start Contact -->
-    <section class="contact-sec" id="contact">
-        <div class="container expand-container">
-            <div class="row align-items-center">
-                <div class="col-12 col-md-12 col-lg-5 wow slideInLeft" data-wow-delay=".5s">
-                    <div class="heading-area">
-                        <h4 class="heading">Questions? <span class="d-block"> Get in Touch</span></h4>
-                    </div>
-                    <div class="contact-details">
-                        <ul>
-                            <li><i aria-hidden="true" class="las la-paper-plane"></i><?= PRODUCT_SUPPORT_EMAIL ?></li>
-                        </ul>
-                    </div>
-                </div>
-                <div class="col-12 col-md-12 col-lg-7 wow slideInRight" data-wow-delay=".5s">
-                    <form class="row contact-form row-padding" id="contact-form-data">
-                        <div class="col-12 col-lg-10" id="result"></div>
-                        <div class="col-12 col-lg-10">
-                            <input type="text" name="userName" placeholder="Name" class="form-control">
-                            <input type="text" name="userPhone" placeholder="Contact No" class="form-control">
-                            <input type="email" name="userEmail" placeholder="Email" class="form-control">
-                            <textarea class="form-control" name="userMessage" rows="6" placeholder="Type Your Message Here"></textarea>
-                            <a href="javascript:void(0);" class="btn btn-medium btn-rounded btn-trans rounded-pill w-100 contact_btn main-font">Submit Information</a>
+
+        <!-- Start Contact -->
+        <section class="contact-sec" id="contact">
+            <div class="container expand-container">
+                <div class="row align-items-center">
+                    <div class="col-12 col-md-12 col-lg-5 wow slideInLeft" data-wow-delay=".5s">
+                        <div class="heading-area">
+                            <h4 class="heading">Questions? <span class="d-block"> Get in Touch</span></h4>
                         </div>
-                    </form>
+                        <div class="contact-details">
+                            <ul>
+                                <li><i aria-hidden="true" class="las la-paper-plane"></i><?= PRODUCT_SUPPORT_EMAIL ?></li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="col-12 col-md-12 col-lg-7 wow slideInRight" data-wow-delay=".5s">
+                        <form class="row contact-form row-padding" id="contact-form-data">
+                            <div class="col-12 col-lg-10" id="result"></div>
+                            <div class="col-12 col-lg-10">
+                                <input type="text" name="userName" placeholder="Name" class="form-control">
+                                <input type="text" name="userPhone" placeholder="Contact No" class="form-control">
+                                <input type="email" name="userEmail" placeholder="Email" class="form-control">
+                                <textarea class="form-control" name="userMessage" rows="6" placeholder="Type Your Message Here"></textarea>
+                                <a href="javascript:void(0);" class="btn btn-medium btn-rounded btn-trans rounded-pill w-100 contact_btn main-font">Submit Information</a>
+                            </div>
+                        </form>
+                    </div>
                 </div>
             </div>
-        </div>
-    </section>
-    <!-- End Contact -->
+        </section>
+        <!-- End Contact -->
 
-    <!-- Start Scroll Top -->
-    <div class="go-top"><i class="fas fa-angle-up"></i><i class="fas fa-angle-up"></i></div>
-    <!-- End Scroll Top -->
+        <!-- Start Scroll Top -->
+        <div class="go-top"><i class="fas fa-angle-up"></i><i class="fas fa-angle-up"></i></div>
+        <!-- End Scroll Top -->
 
-    <!-- JavaScript -->
-    <script src="/float-ev/common/js/bundle.min.js"></script>
-    <!-- Plugin Js -->
-    <script src="/float-ev/common/js/morphext.min.js"></script>
-    <script src="/float-ev/common/js/jquery.appear.js"></script>
-    <script src="/float-ev/common/js/jquery.fancybox.min.js"></script>
-    <script src="/float-ev/common/js/owl.carousel.min.js"></script>
-    <script src="/float-ev/common/js/wow.min.js"></script>
-    <script src="/float-ev/common/js/jquery.cubeportfolio.min.js"></script>
+        <!-- JavaScript -->
+        <script src="/float-ev/common/js/bundle.min.js"></script>
+        <!-- Plugin Js -->
+        <script src="/float-ev/common/js/morphext.min.js"></script>
+        <script src="/float-ev/common/js/jquery.appear.js"></script>
+        <script src="/float-ev/common/js/jquery.fancybox.min.js"></script>
+        <script src="/float-ev/common/js/owl.carousel.min.js"></script>
+        <script src="/float-ev/common/js/wow.min.js"></script>
+        <script src="/float-ev/common/js/jquery.cubeportfolio.min.js"></script>
 
-    <!-- CUSTOM JS -->
-    <script src="/float-ev/common/js/contact_us.js"></script>
-    <script src="/float-ev/js/script.js"></script>
+        <!-- CUSTOM JS -->
+        <script src="/float-ev/common/js/contact_us.js"></script>
+        <script src="/float-ev/js/script.js"></script>
 
 </body>