Is there an option to resolve this merge conflict automatically?

I have next merge conflict when merging release/77-fix:

<<<<<<< HEAD
                # Distinguish e.g. staging from front-end-dev etc.
                $environment_prefix = '.' . Proj::Env->host_group
                    if index($settings->{public}{brand}{domain}, Proj::Env->host_group) == -1;
||||||| f43fbfa064
                # Distinguish e.g. staging from front-end-dev, uat etc.
                $environment_prefix = '.' . Proj::Env->host_group;
=======
                # Distinguish e.g. staging from front-end-dev, uat etc.
                $environment_prefix = '.' . Proj::Env->host_group
                    if index($settings->{public}{brand}{domain}, Proj::Env->host_group) == -1;
>>>>>>> release/77-fix

I suppose this merge conflict should be resolved automatically, because HEAD already contain changes from release/77-fix

Here is change which cause conflict:

@@ -424,7 +424,7 @@ sub uri ($class, %args) {
             # the production environment's URLs.
             my $environment_prefix;
             if (Chimera::Env->running_in_test_environment) {
-                # Distinguish e.g. staging from front-end-dev, uat etc.
+                # Distinguish e.g. staging from front-end-dev etc.
                 $environment_prefix = '.' . Chimera::Env->host_group
                     if index($settings->{public}{brand}{domain}, Chimera::Env->host_grou>
             } elsif (Chimera::Env->running_in_development_environment) {

Is there an option to resolve this type of conflict automatically?