diff --git a/olivierdeschacht/cupp.cfg b/olivierdeschacht/cupp.cfg
index d5430ec..6f6e6d7 100644
--- a/olivierdeschacht/cupp.cfg
+++ b/olivierdeschacht/cupp.cfg
@@ -13,14 +13,7 @@
 # If you don't need some chars, just comment it! Duplicates are allowed too.
 # For adding chars, you might need to add some lines in cupp.py...
 [years]
-<<<<<<< HEAD
-#years = 2014
-years = 2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020
-
-
-=======
 years =  1988,1989,1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021
->>>>>>> ce4144fab82340b3c9d5adb48ba585ec7c72cb9a
 
 [leet]
 a=@
@@ -37,7 +30,7 @@ z=z
 # separated by comma
 
 [specialchars]
-chars=!,*,?
+chars=!,&,*,?,$
 
 
 # [ Random years ] take it as much as you need!