diff --git a/public/assets/css/ci-theme.css b/public/assets/css/ci-theme.css
index 7cb85c2..2beec55 100644
--- a/public/assets/css/ci-theme.css
+++ b/public/assets/css/ci-theme.css
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /* CodeIgniter 4 - Website
  ============================================================================ */
 /* Forum: 	https://forum.codeigniter.com