diff --git a/docker/Dockerfile b/docker/Dockerfile
index e33087c3..58bb8745 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,24 +4,24 @@ ARG PYTHON_VERSION="3.9"
 ARG POETRY_VERSION="1.1.15"
 
 ARG BUILD_DEPS="\
-    python3-dev \
-    build-essential \
-    gettext \
-    libpq-dev \
-    cmake \
-    pkg-config \
-    autoconf \
-    libtool \
-    automake"
+  python3-dev \
+  build-essential \
+  gettext \
+  libpq-dev \
+  cmake \
+  pkg-config \
+  autoconf \
+  libtool \
+  automake"
 
 ARG RUNTIME_DEPS="\
-    tzdata \
-    curl \
-    gosu \
-    gettext \
-    postgresql-client \
-    ffmpeg \
-    libmagic1"
+  tzdata \
+  curl \
+  gosu \
+  gettext \
+  postgresql-client \
+  ffmpeg \
+  libmagic1"
 
 FROM python:${PYTHON_VERSION}-slim as base
 
@@ -32,28 +32,28 @@ ARG APP_VERSION="0.1"
 
 # set environment variables
 ENV APP_VERSION=${APP_VERSION} \
-    RUNTIME_DEPS=${RUNTIME_DEPS} \
-    BUILD_DEPS=${BUILD_DEPS} \
-    APPLICATION_NAME="Chats" \
-    PROJECT_PATH=/chats \
-    PROJECT_USER=app_user \
-    PROJECT_GROUP=app_group \
-    PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    PYTHONIOENCODING=UTF-8 \
-    PIP_DISABLE_PIP_VERSION_CHECK=1 \
-    PATH="/install/bin:${PATH}" \
-    APP_PORT=${APP_PORT}
+  RUNTIME_DEPS=${RUNTIME_DEPS} \
+  BUILD_DEPS=${BUILD_DEPS} \
+  APPLICATION_NAME="Chats" \
+  PROJECT_PATH=/chats \
+  PROJECT_USER=app_user \
+  PROJECT_GROUP=app_group \
+  PYTHONDONTWRITEBYTECODE=1 \
+  PYTHONUNBUFFERED=1 \
+  PYTHONIOENCODING=UTF-8 \
+  PIP_DISABLE_PIP_VERSION_CHECK=1 \
+  PATH="/install/bin:${PATH}" \
+  APP_PORT=${APP_PORT}
 
 LABEL app=${VERSION} \
-    os="debian" \
-    os.version="10" \
-    name="${APPLICATION_NAME} ${APP_VERSION}" \
-    description="${APPLICATION_NAME} image" \
-    maintainer="${APPLICATION_NAME} Team"
+  os="debian" \
+  os.version="10" \
+  name="${APPLICATION_NAME} ${APP_VERSION}" \
+  description="${APPLICATION_NAME} image" \
+  maintainer="${APPLICATION_NAME} Team"
 
 RUN addgroup --gid 1999 "${PROJECT_GROUP}" \
-    && useradd --system -m -d ${PROJECT_PATH} -u 1999 -g 1999 "${PROJECT_USER}"
+  && useradd --system -m -d ${PROJECT_PATH} -u 1999 -g 1999 "${PROJECT_USER}"
 
 # set work directory
 WORKDIR ${PROJECT_PATH}
@@ -100,7 +100,11 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 COPY --from=build /install /usr/local
 COPY --chown=${PROJECT_USER}:${PROJECT_GROUP} . ${PROJECT_PATH}
 
+<<<<<<< HEAD
 USER "${PROJECT_USER}:${PROJECT_USER}"
+=======
+USER "${PROJECT_USER}:${PROJECT_GROUP}"
+>>>>>>> feature/new-dockerfile
 
 EXPOSE 8000