Update airgap.md

docs/docs-content/enterprise-version/upgrade/upgrade-vmware/airgap.md

@@ -15,14 +15,8 @@ details.
 
 :::warning
 
-<<<<<<< HEAD
 Before upgrading Palette to a new major version, you must first update it to the latest minor version available. Refer
 to the [Supported Upgrade Paths](../upgrade.md#supported-upgrade-paths) section for details.
-=======
-If you are upgrading from a Palette version that is older than 4.4.14, ensure that you have executed the utility script
-to make the CNS mapping unique for the associated PVC. For more information, refer to the
-[Troubleshooting guide](../../../troubleshooting/enterprise-install.md#scenario---non-unique-vsphere-cns-mapping).
->>>>>>> 620b471aa (docs: DOC-1500: "Too many open files" Troubleshooting (#4967))
 
 :::