fixed merge conflicts in genai course

Author: irina-loghin-neo4j

asciidoc/courses/genai-mcp-build-custom-tools-python/modules/1-getting-started/lessons/1-mcp-python-sdk/lesson.adoc

@@ -249,15 +249,9 @@ The Streamable HTTP transport method exposes the tools through a HTTP server, wi
 [source,python]
 ----
 mcp.run(
-<<<<<<< HEAD
-    transport="streamable-http", 
-    host="127.0.0.1", 
-    port=8000, 
-=======
     transport="http",
     host="127.0.0.1",
     port=8000,
->>>>>>> 2b278d50 (use different attribute for greeting example)
     path="/mcp"
 )
 ----

asciidoc/courses/genai-mcp-build-custom-tools-python/modules/1-getting-started/lessons/3c-create-first-server/lesson.adoc

@@ -244,4 +244,4 @@ In this challenge, you successfully built your first MCP server from scratch:
 * **Interactive testing** - Tested the server with the Python client for immediate feedback
 
 
-In the next module, you will learn about context management for handling server lifecycle and resource management, and you'll start building tools that connect to Neo4j.
+In the next module, you will learn about context management for handling server lifecycle and resource management, and you'll start building tools that connect to Neo4j.

asciidoc/courses/genai-mcp-build-custom-tools-python/modules/2-database-features/lessons/2c-add-neo4j-connection/lesson.adoc

@@ -68,6 +68,7 @@ NEO4J_DATABASE={instance-database}
 
 
 [NOTE]
+.The .env file is already in .gitignore
 ====
 The `.env` file is already in `.gitignore` so your credentials won't be committed to version control.
 ====

asciidoc/courses/genai-mcp-build-custom-tools-python/modules/3-integration-advanced/lessons/3-advanced-features/lesson.adoc

@@ -47,6 +47,7 @@ Use sampling when you need:
 * Recommendations or insights derived from data
 
 [NOTE]
+.Sampling requires client support
 ====
 Sampling requires client support and adds processing overhead. The client must support the sampling capability for this feature to work.
 ====
@@ -95,6 +96,7 @@ Use completions when:
 * Form-based interfaces benefit from autocomplete
 
 [NOTE]
+.Completions requires using the low-level Server API
 ====
 Completions require using the low-level `Server` API instead of FastMCP's decorator-based approach.
 ====