resolve hanging conflicts

website/content/partials/builder/yandex/Config-not-required.mdx

@@ -11,22 +11,3 @@
 
 - `target_image_folder_id` (string) - The ID of the folder to save built image in.
   This defaults to value of 'folder_id'.
-<<<<<<< HEAD:website/pages/partials/builder/yandex/Config-not-required.mdx
-=======
-
-- `use_ipv4_nat` (bool) - If set to true, then launched instance will have external internet
-  access.
-
-- `use_ipv6` (bool) - Set to true to enable IPv6 for the instance being
-  created. This defaults to `false`, or not enabled.
-
-  -> **Note**: Usage of IPv6 will be available in the future.
-
-- `use_internal_ip` (bool) - If true, use the instance's internal IP address
-  instead of its external IP during building.
-
-- `zone` (string) - The name of the zone to launch the instance. This defaults to `ru-central1-a`.
-
-- `state_timeout` (duration string | ex: "1h5m2s") - The time to wait for instance state changes.
-  Defaults to `5m`.
->>>>>>> ce92f0ec7 (refactor to mdx remote):website/content/partials/builder/yandex/Config-not-required.mdx

website/content/partials/post-processor/yandex-export/Config-not-required.mdx

@@ -4,16 +4,4 @@
   The `~` can be used in path and will be expanded to the home directory
   of current user. Login for attach: `ubuntu`
 
-<<<<<<< HEAD:website/pages/partials/post-processor/yandex-export/Config-not-required.mdx
 - `tries` (int) - Number of attempts to wait for export (must be greater than 0). Default: 1000
-=======
-- `disk_type` (string) - Specify disk type for the launched instance. Defaults to `network-ssd`.
-
-- `platform_id` (string) - Identifier of the hardware platform configuration for the instance. This defaults to `standard-v2`.
-
-- `subnet_id` (string) - The Yandex VPC subnet id to use for
-  the launched instance. Note, the zone of the subnet must match the
-  zone in which the VM is launched.
-
-- `zone` (string) - The name of the zone to launch the instance. This defaults to `ru-central1-a`.
->>>>>>> ce92f0ec7 (refactor to mdx remote):website/content/partials/post-processor/yandex-export/Config-not-required.mdx