diff --git a/pmcalendar.php b/pmcalendar.php
index 5330f98..f6b87d7 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -1404,11 +1404,7 @@ if ($act == 'newevent') {
                             axisLabel:{
                                 show: true,
                                 textStyle:{
-<<<<<<< HEAD
                                     color:"#969696"
-=======
-                                    color:"#bfbfbf"
->>>>>>> 2c187a10dc1a85dccde8edefa5131586357f8f3f
                                 }
                             },
                             axisLine:{