diff --git a/de/home/.config/katerc b/de/home/.config/katerc
index b29df22..b891119 100644
--- a/de/home/.config/katerc
+++ b/de/home/.config/katerc
@@ -172,17 +172,10 @@ SetEditor=false
 1920x1200 screen: Width=1896
 2 screens: Height=1119
 2 screens: Width=490
-<<<<<<< HEAD
-2048x1280 screen: Height=353
-2048x1280 screen: Width=656
-3 screens: Height=609
-3 screens: Width=1128
-=======
 2048x1280 screen: Height=1199
 2048x1280 screen: Width=1005
 3 screens: Height=331
 3 screens: Width=1125
->>>>>>> 5ed35731d881bfaa55d6099c79a779c7c4278309
 
 [filetree]
 editShade=183,220,246