diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index ecdce4dd17..61046c84bb 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -709,11 +709,7 @@ static int usecount(void)
 	return 0;
 }
 
-<<<<<<< .mine
 static const char *key(void)
-=======
-const char *key(void)
->>>>>>> .r19220
 {
 	return ASTERISK_GPL_KEY;
 }