Fixed conflicts and updated comments

Author: Thoughtseize1

compute/client_library/ingredients/disks/сonsistency_groups/stop_replication_consistency_group.py

@@ -13,11 +13,6 @@
 #  limitations under the License.
 # flake8: noqa
 
-
-# This file is automatically generated. Please do not modify it directly.
-# Find the relevant recipe file in the samples/recipes or samples/ingredients
-# directory and apply your changes there.
-
 from google.cloud import compute_v1
 
 

compute/client_library/snippets/tests/test_disks.py

@@ -17,6 +17,7 @@
 from google.api_core.exceptions import NotFound
 import google.auth
 from google.cloud import compute_v1, kms_v1
+
 import pytest
 
 from ..disks.attach_disk import attach_disk
@@ -50,14 +51,6 @@
 from ..disks.сonsistency_groups.remove_disk_consistency_group import (
     remove_disk_consistency_group,
 )
-from ..disks.сonsistency_groups.add_disk_consistency_group import (
-    add_disk_consistency_group,
-)
-from ..disks.сonsistency_groups.create_consistency_group import create_consistency_group
-from ..disks.сonsistency_groups.delete_consistency_group import delete_consistency_group
-from ..disks.сonsistency_groups.remove_disk_consistency_group import (
-    remove_disk_consistency_group,
-)
 from ..disks.сonsistency_groups.stop_replication_consistency_group import (
     stop_replication_consistency_group,
 )
@@ -68,7 +61,6 @@
 from ..snapshots.create import create_snapshot
 from ..snapshots.delete import delete_snapshot
 
-
 PROJECT = google.auth.default()[1]
 ZONE = "europe-west2-c"
 ZONE_SECONDARY = "europe-west1-c"