diff --git a/config.c b/config.c
index f58c80ab..29dd25cc 100644
--- a/config.c
+++ b/config.c
@@ -170,8 +170,6 @@ parse_line(char *buff, char *name, char *value)
 	trim(value);
 }
 
-<<<<<<< HEAD:config.c
-
 bool
 reload_configuration(char *config_file, t_configuration_options *orig_options)
 {