diff --git a/authd/authd.c b/authd/authd.c
index b4502a68..8097679b 100644
--- a/authd/authd.c
+++ b/authd/authd.c
@@ -29,7 +29,6 @@ static void handle_stat(int parc, char *parv[]);
 
 rb_helper *authd_helper = NULL;
 authd_cmd_handler authd_cmd_handlers[256] = {
-<<<<<<< HEAD
 	['C'] = handle_new_connection,
 	['D'] = resolve_dns,
 	['R'] = handle_reload,