diff --git a/config/substitution/default.conf b/config/substitution/default.conf
index 0a7a9a6b..f09d2c1e 100644
--- a/config/substitution/default.conf
+++ b/config/substitution/default.conf
@@ -14,8 +14,6 @@
 -="dash"
 $="dollar"
 .="dot"
-<<<<<<< HEAD
-=="equals"
 >="greater"
 `="grave"
 #="hash"
@@ -24,6 +22,7 @@ $="dollar"
 (="left paren"
 <="less"
 %="percent"
++="plus"
 ?="question"
 "="quote"
 )="right paren"
@@ -32,12 +31,7 @@ $="dollar"
 /="slash"
 *="star"
 ~="tilde"
-=======
-?="questionmark"
-!="etremationmark"
-"="double qoute"
-'="single quote"
->>>>>>> 2775431fb763961cbcb9c9e518fa4c642b1838a3
+_="line"
 
 [userDict]
 chrys="lord chrys"