diff --git a/Dockerfile b/Dockerfile
index d61e8a4..9de681e 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,13 +7,7 @@ RUN apt update;apt install -y bash curl openssl postgresql postgresql-contrib gi
 COPY nodesource /etc/apt/preferences.d/
 RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -;apt update; apt -y install nodejs yarn
 WORKDIR /opt
-RUN git clone -b master https://github.com/misskey-dev/misskey.git --depth=1
-<<<<<<< HEAD
-=======
-#RUN corepack enable
-WORKDIR /opt/misskey
-RUN npm install -g pnpm vite;git submodule update --init;pnpm install --frozen-lockfile;NODE_ENV=production pnpm run build
->>>>>>> c3a41140814de70ea3513cbd59b57b8b70aecca2
+RUN git clone -b develop https://github.com/misskey-dev/misskey.git --depth=1
 RUN rm -rf /etc/nginx/conf.d/*
 RUN rm -f /etc/nginx/sites-enabled/default 
 RUN rm -f /etc/nginx/sites-available/default 
@@ -23,7 +17,6 @@ COPY example.yml /opt/misskey/.config/default.yml
 COPY misskey.conf /etc/nginx/sites-enabled/
 COPY nginx.conf /etc/nginx/
 COPY postgresql.conf /etc/
-COPY pg_hba.conf /etc/
 COPY crontab /
 RUN crontab /crontab
 CMD bash /opt/start.sh