diff --git a/blocks.def/cpu_temp_button.sh b/blocks.def/cpu_temp_button.sh
index 68dab22..763409e 100755
--- a/blocks.def/cpu_temp_button.sh
+++ b/blocks.def/cpu_temp_button.sh
@@ -3,6 +3,5 @@
 case "$1" in
     1) "$TERMINAL" -e "htop" ;;
     2) "$TERMINAL" -e "bashmount" ;;
-    #3) "$TERMINAL" -e "psensor" ;;
     3) psensor ;;
 esac
diff --git a/config.def.h b/config.def.h
index eb67bed..c98c51a 100644
--- a/config.def.h
+++ b/config.def.h
@@ -16,7 +16,8 @@
 #define DELIMITERENDCHAR                10
 
 /* delimiter specified as an array of characters
- * don't remove DELIMITERENDCHAR at the end */
+<<<<<<< HEAD
+ * (don't remove DELIMITERENDCHAR at the end) */
 static const char delimiter[] = { ' ', ' ', DELIMITERENDCHAR };
 
 #include "block.h"
diff --git a/patches/dwm-systray-dwmblocks-6.2.diff b/patches/dwm-systray-dwmblocks-6.2.diff
index a77bdee..174acf7 100644
--- a/patches/dwm-systray-dwmblocks-6.2.diff
+++ b/patches/dwm-systray-dwmblocks-6.2.diff
@@ -43,7 +43,7 @@ diff -ruN dwm-6.2-ori/config.def.h dwm-6.2/config.def.h
  	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
 diff -ruN dwm-6.2-ori/dwm.c dwm-6.2/dwm.c
 --- dwm-6.2-ori/dwm.c	2020-08-17 23:51:19.057243495 +0530
-+++ dwm-6.2/dwm.c	2021-08-03 19:19:36.009135193 +0530
++++ dwm-6.2/dwm.c	2021-08-20 20:59:38.894111552 +0530
 @@ -40,6 +40,7 @@
  #include <X11/extensions/Xinerama.h>
  #endif /* XINERAMA */
@@ -427,11 +427,11 @@ diff -ruN dwm-6.2-ori/dwm.c dwm-6.2/dwm.c
 +                        else
 +                                *(sts++) = *rst;
 +                *stp = *stc = *sts = '\0';
-+                wstext = TEXTW(stextp) + LSPAD + RSPAD;
++                wstext = TTEXTW(stextp) + LSPAD + RSPAD;
 +        } else {
 +                strcpy(stextc, "dwm-"VERSION);
 +                strcpy(stexts, stextc);
-+                wstext = TEXTW(stextc) + LSPAD + RSPAD;
++                wstext = TTEXTW(stextc) + LSPAD + RSPAD;
 +        }
 +        drawbar(selmon);
  }