diff --git a/docker/Dockerfile b/docker/Dockerfile
index ab1be17..582fe2f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,5 @@
 # syntax=docker/dockerfile:1
 FROM debian:sid
-<<<<<<< HEAD
 RUN apt update && apt install -y make bash gawk g++ gcc libc6-dev flex bison automake autoconf gperf texinfo wget git bzip2 help2man libtool libtool-bin unrar-free unzip ncurses-dev libexpat-dev python-dev python3; mkdir /app; chown 1000:1000 /app; cd /app; useradd user;
 USER 1000
 RUN cd app; git clone --recursive https://github.com/SuperHouse/esp-open-rtos.git modules/rtos; git clone --recursive https://github.com/pfalcon/esp-open-sdk.git modules/sdk
@@ -11,12 +10,4 @@ RUN apt remove --purge -y python2 && apt autoremove --purge -y && apt install -y
 RUN apt install -y --reinstall python-is-python3
 USER 1000
 WORKDIR /app
-ENV PATH=/app/modules/sdk/xtensa-lx106-elf/bin:$PATH
-=======
-RUN apt update && apt install -y make bash gawk g++ gcc libc6-dev flex bison automake autoconf gperf texinfo wget git bzip2 help2man libtool libtool-bin unrar-free unzip ncurses-dev libexpat-dev python-dev python3
-RUN mkdir modules; git clone --recursive https://github.com/SuperHouse/esp-open-rtos.git modules/rtos; git clone --recursive https://github.com/pfalcon/esp-open-sdk.git modules/sdk
-RUN sed -i 's/GNU bash, version (3\\\.\[1-9\]|4)/GNU bash, version (3.[1-9]|4|5)/g' modules/sdk/crosstool-NG/configure.ac; mkdir -p modules/sdk/crosstool-NG/.build/tarballs; wget https://github.com/libexpat/libexpat/releases/download/R_2_1_0/expat-2.1.0.tar.gz -O modules/sdk/crosstool-NG/.build/tarballs/expat-2.1.0.tar.gz
-RUN cd modules/sdk; export CT_EXPERIMENTAL=y; export CT_ALLOW_BUILD_AS_ROOT=y; export CT_ALLOW_BUILD_AS_ROOT_SURE=y; make standalone=y -j$(nproc); wget -N https://raw.githubusercontent.com/espressif/esptool/master/esptool.py -O xtensa-lx106-elf/bin/esptool.py
-RUN apt remove --purge -y python2 && apt install -y make python3 python3-serial python-is-python3 perl
-ENV PATH=/modules/sdk/xtensa-lx106-elf/bin:$PATH
->>>>>>> 94c54ac (add Dockerfile for build environment)
+ENV PATH=/app/modules/sdk/xtensa-lx106-elf/bin:$PATH
\ No newline at end of file