remove note about using oras

Author: amsuggs37

docs/book/src/03_topics/02_configuration/01_air-gapped-environtment.md

@@ -80,12 +80,16 @@ Example layout for a `kubeadm` provider may look like:
 - `control-plane-components.yaml`
 - `bootstrap-components.yaml`
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 See the [plugin docs](../03_plugin/03_publish_subcommand.md) for more information on how to properly build and publish the OCI artifacts to the air-gapped registry.
 =======
 See the [plugin docs](../03_plugin/03_publish_subcommand.md) for more information on how to properly build and publish the OCI artifacts to the air-gapped registry.<br>
 Other tools, such as [oras](https://oras.land/docs/), behvae in a similar fashion and can also be used to build and publish the OCI artifacts.
 >>>>>>> 11a4553 (add a note on how to enable fetching oci artifacts using plain http)
+=======
+See the [plugin docs](../03_plugin/03_publish_subcommand.md) for more information on how to properly build and publish the OCI artifacts to the air-gapped registry.
+>>>>>>> a58babb (remove note about using oras)
 
 To fetch provider components which are stored as an OCI artifact, you can configure `fetchConfig.oci` field to pull them directly from an OCI registry: