diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3d681ca3..a2fd9b31 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-FROM python:3.11.10-slim-bullseye
-=======
 FROM python:3.11.10-bullseye
->>>>>>> 11b482838efcf46f376fd3ecbf2c1bb0be6d097d
 
 
 ARG USER=vscode
@@ -14,17 +10,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential pkg-config automake autoconf libtool \
  && rm -rf /var/lib/apt/lists/*
 
-<<<<<<< HEAD
-# 2) Build and install libpostal from source
-RUN git clone --depth 1 https://github.com/openvenues/libpostal /tmp/libpostal \
- && cd /tmp/libpostal \
- && ./bootstrap.sh \
- && ./configure --datadir=/usr/local/share/libpostal \
- && make -j"$(nproc)" \
- && make install \
- && ldconfig \
- && rm -rf /tmp/libpostal
-=======
 # # 2) Build and install libpostal from source
 # RUN git clone --depth 1 https://github.com/openvenues/libpostal /tmp/libpostal \
 #  && cd /tmp/libpostal \
@@ -34,26 +19,12 @@ RUN git clone --depth 1 https://github.com/openvenues/libpostal /tmp/libpostal \
 #  && make install \
 #  && ldconfig \
 #  && rm -rf /tmp/libpostal
->>>>>>> 11b482838efcf46f376fd3ecbf2c1bb0be6d097d
 
 # 3) Create the user and grant sudo privileges
 RUN useradd -m -s /usr/bin/bash ${USER} \
  && echo "${USER} ALL=(ALL) NOPASSWD: ALL" >/etc/sudoers.d/${USER} \
  && chmod 0440 /etc/sudoers.d/${USER}
 
-<<<<<<< HEAD
-# 4) Python deps - if you want to run assest list
-ENV PIP_NO_CACHE_DIR=1 PIP_DISABLE_PIP_VERSION_CHECK=1
-ADD asset_list/requirements.txt requirements.txt
-RUN pip install -r requirements.txt
-
-# 
-# ENV PIP_NO_CACHE_DIR=1 PIP_DISABLE_PIP_VERSION_CHECK=1
-# ADD backend/engine/requirements.txt requirements1.txt
-# ADD backend/app/requirements/requirements.txt requirements2.txt
-# RUN cat requirements1.txt requirements2.txt > requirements.txt
-# RUN pip install -r requirements.txt
-=======
 # # 4) Python deps - if you want to run assest list
 # ENV PIP_NO_CACHE_DIR=1 PIP_DISABLE_PIP_VERSION_CHECK=1
 # ADD asset_list/requirements.txt requirements.txt
@@ -66,15 +37,10 @@ ADD backend/app/requirements/requirements.txt requirements2.txt
 ADD .devcontainer/requirements.txt requirements3.txt
 RUN cat requirements1.txt requirements2.txt requirements3.txt > requirements.txt
 RUN pip install -r requirements.txt
->>>>>>> 11b482838efcf46f376fd3ecbf2c1bb0be6d097d
 
 # 5) Workdir
 WORKDIR /workspaces/model
 
 # 6) Make Python find your package
 # Add project root to PYTHONPATH for all processes
-<<<<<<< HEAD
 ENV PYTHONPATH=/workspaces/model:${PYTHONPATH}
-=======
-ENV PYTHONPATH=/workspaces/model:${PYTHONPATH}
->>>>>>> 11b482838efcf46f376fd3ecbf2c1bb0be6d097d