diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e39961bd..20c25d99 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,8 +15,5 @@
     "postCreateCommand": "pip install -r test_requirements.txt && pip install ruff requests pre-commit",
     "remoteUser": "root",
     "workspaceFolder": "/workspaces/safety",
-<<<<<<< HEAD
-=======
     "forwardPorts": [49152]
->>>>>>> cac1ecb (feat/add-devcontainers-support)
 }