diff --git a/python_modules/dagster/dagster/_core/definitions/assets.py b/python_modules/dagster/dagster/_core/definitions/assets.py
index 81e11e0d3a935..58f78f11ac95d 100644
--- a/python_modules/dagster/dagster/_core/definitions/assets.py
+++ b/python_modules/dagster/dagster/_core/definitions/assets.py
@@ -1403,7 +1403,6 @@ def _output_to_source_asset(self, output_name: str) -> SourceAsset:
 
     @public
     def get_asset_spec(self, key: Optional[AssetKey] = None) -> AssetSpec:
-<<<<<<< HEAD
         """Returns a representation of this asset as an :py:class:`AssetSpec`.
 
         If this is a multi-asset, the "key" argument allows selecting which asset to return the