diff --git a/www/application/views/templates/footer.php b/www/application/views/templates/footer.php
index 0591a4c..f531270 100644
--- a/www/application/views/templates/footer.php
+++ b/www/application/views/templates/footer.php
@@ -1,10 +1,5 @@
         <em>&copy; 2017</em>
-<<<<<<< HEAD
         <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-=======
-        <script type="text/javascript" src="assets/js/bootstrap.js"></script>
-        <script type="text/javascript" src="assets/js/jQuery-1.10.2.js"></script>
->>>>>>> f2345dcf3248c7cb7988340a999f238e7dfcfda7
       </body>
 </html>