From addbf2768fa7c47e6c02c8b6acf1e1ec0eeb2b27 Mon Sep 17 00:00:00 2001
From: Jameelah Mercer <36314199+MeelahMe@users.noreply.github.com>
Date: Fri, 28 Feb 2025 14:26:59 -0800
Subject: [PATCH] conflict update

---
 content/shared/v3-core-get-started/_index.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/content/shared/v3-core-get-started/_index.md b/content/shared/v3-core-get-started/_index.md
index 4410691f7..2b69502ae 100644
--- a/content/shared/v3-core-get-started/_index.md
+++ b/content/shared/v3-core-get-started/_index.md
@@ -165,11 +165,7 @@ To run the [Docker image](/influxdb3/core/install/#docker-image) and persist dat
 - `--object-store file --data-dir /path/in/container`: Uses the mount for server storage
 
 > [!Note]
-<<<<<<< HEAD
-> The InfluxDB 3 Core Docker image can expose port 8181.
-=======
 > The {{% product-name %}} Docker image exposes port `8181`, the default for the `influxdb3` server HTTP port.
->>>>>>> refs/remotes/origin/docs/v3/docker-port-update-5826
 
 ```bash
 # FILESYSTEM USING DOCKER