fix regress tests after rebase

Author: okbob

expected/plpgsql_check_active.out

@@ -3550,7 +3550,6 @@ select * from plpgsql_check_function('test_crash', fatal_errors := true);
 (5 rows)
 
 drop function test_crash();
-<<<<<<< HEAD
 -- fix false alarm reported by Piotr Stepniewski
 create or replace function public.fx()
 returns void
@@ -3605,8 +3604,6 @@ select * from plpgsql_check_function('fx()');
 (2 rows)
 
 drop function fx();
-=======
->>>>>>> 4c5b5703551fc485a52f6f4f2dca7fc6bfb01dcf
 create or replace function foo_format(a text, b text)
 returns void as $$
 declare s text;
@@ -3688,15 +3685,9 @@ begin
 end;
 $$ language plpgsql;
 select * from plpgsql_check_function('dyn_sql_2', security_warnings := true);
-<<<<<<< HEAD
                    plpgsql_check_function                   
 ------------------------------------------------------------
  error:42703:9:EXECUTE:column "c" not found in data type tp
-=======
-                   plpgsql_check_function                    
--------------------------------------------------------------
- error:42703:14:EXECUTE:column "c" not found in data type tp
->>>>>>> 4c5b5703551fc485a52f6f4f2dca7fc6bfb01dcf
  Query: select $1.c
  --     ^
 (3 rows)

sql/plpgsql_check_active.sql

@@ -2581,7 +2581,6 @@ select * from plpgsql_check_function('test_crash', fatal_errors := true);
 
 drop function test_crash();
 
-<<<<<<< HEAD
 -- fix false alarm reported by Piotr Stepniewski
 create or replace function public.fx()
 returns void
@@ -2630,8 +2629,6 @@ select * from plpgsql_check_function('fx()');
 
 drop function fx();
 
-=======
->>>>>>> 4c5b5703551fc485a52f6f4f2dca7fc6bfb01dcf
 create or replace function foo_format(a text, b text)
 returns void as $$
 declare s text;