resolve merge conflicts

Author: Yuan325

docs/en/integrations/dataplex/prebuilt-configs/dataplex.md

@@ -17,3 +17,4 @@ description: "Details of the Knowledge Catalog(formerly known as Dataplex) prebu
     *   `search_entries`: Searches for entries in Knowledge Catalog.
     *   `lookup_entry`: Retrieves a specific entry from Knowledge Catalog.
     *   `search_aspect_types`: Finds aspect types relevant to the query.
+    *   `lookup_context`: Retrieves rich metadata regarding one or more data assets along with their relationships.