Hello Git, I got this merge conflict: ``` sub alter_field { my ($from_field, $to_field, $options) = @_; die "Can't alter field in another table" if ($from_field->table->name ne $to_field->table->name); <<<<<<< HEAD my $generator = _generator($options); my @out; ||||||| parent of 1bfbcdad (Introduce and use Postgres in-database schemas) die "Can't alter field in another table" if($from_field->table->name ne $to_field->table->name); ======= die "Can't alter field in another table" if($from_field->table->qualified_name ne $to_field->table->qualified_name); >>>>>>> 1bfbcdad (Introduce and use Postgres in-database schemas) # drop geometry column and constraints push @out, drop_geometry_column($from_field, $options), drop_geometry_constraints($from_field, $options), if is_geometry($from_field); ``` But I expect it to be like this: ``` sub alter_field { my ($from_field, $to_field, $options) = @_; <<<<<<< HEAD die "Can't alter field in another table" if ($from_field->table->name ne $to_field->table->name); ||||||| parent of 1bfbcdad (Introduce and use Postgres in-database schemas) die "Can't alter field in another table" if($from_field->table->name ne $to_field->table->name); ======= die "Can't alter field in another table" if($from_field->table->qualified_name ne $to_field->table->qualified_name); >>>>>>> 1bfbcdad (Introduce and use Postgres in-database schemas) my $generator = _generator($options); my @out; # drop geometry column and constraints push @out, drop_geometry_column($from_field, $options), drop_geometry_constraints($from_field, $options), if is_geometry($from_field); ``` Why merge conflict block is located at the wrong place? git version 2.49.0 -- Best regards, Eugen Konkov