Resolve merge conflicts with main

Author: loujaybee

.gitpod/automations.yaml

@@ -152,7 +152,7 @@ tasks:
 
   openDemoPorts:
     name: "Open Demo Ports"
-    description: "Opens ports 3000, 3001, and 3002 for the demo"
+    description: "Opens ports 3000 and 3001 for the demo"
     triggeredBy:
       - postEnvironmentStart
       - manual

docs/devcontainer-best-practices.md

@@ -14,7 +14,7 @@ A DevContainer (Development Container) is a Docker container that defines your d
 
 When configuring your development environment, it's recommended to use [DevContainer features](https://containers.dev/features) whenever possible. Features are reusable, pre-configured components that can be added to your devcontainer.json file. They provide a standardized way to add common tools, languages, and services to your development environment.
 
-The available features are documented in the `/workspaces/flex-demo/docs/devcontainer-features.yml` file, which is manually pulled from the [DevContainer collection index](https://github.com/devcontainers/devcontainers.github.io/blob/gh-pages/_data/collection-index.yml). This ensures you have access to the latest community-maintained features.
+The available features are documented in the `/workspaces/gitpodflix-demo/docs/devcontainer-features.yml` file, which is manually pulled from the [DevContainer collection index](https://github.com/devcontainers/devcontainers.github.io/blob/gh-pages/_data/collection-index.yml). This ensures you have access to the latest community-maintained features.
 
 Example usage in devcontainer.json: