diff --git a/rigctld/Dockerfile b/rigctld/Dockerfile
deleted file mode 100644
index e54d888..0000000
--- a/rigctld/Dockerfile
+++ /dev/null
@@ -1,52 +0,0 @@
-# build rigctld
-
-<<<<<<< HEAD
-FROM debian:latest
-
-RUN mkdir src
-# this might be too much, but let's try it
-RUN apt update
-RUN apt install -y libconfig-dev autoconf libtool git gcc g++ make cmake libudev-dev libreadline-dev libusb-1.0-0-dev libavahi-common-dev libavahi-client-dev
-
-# build hamlib/rigctld
-=======
-FROM debian:latest AS farpn-base
-ENV DEBIAN_FRONTEND="noninteractive" TZ="Etc/UTC"
-
-# this might be too much, but let's try it
-RUN apt update
-RUN apt update \
-    && apt install -y build-essential libconfig-dev autoconf \
-    libtool git gcc g++ make cmake libudev-dev libusb-1.0-0-dev \
-    libavahi-common-dev libavahi-client-dev
-
-
-# build hamlib/rigctld
-FROM farpn-base AS rigctld-builder
-
->>>>>>> d078273 (moved dockerfile for rigctld, added config stubs)
-RUN <<EOF
-mkdir src
-cd src
-git clone --branch 4.6.5 --single-branch https://github.com/Hamlib/Hamlib.git
-cd Hamlib
-<<<<<<< HEAD
-./bootstrap
-./configure
-make
-EOF
-
-=======
-mkdir build; cd build
-../bootstrap
-../configure --prefix=/usr/local
-make clean
-make
-make install
-EOF
-
-FROM farpn-base AS rigctld
-COPY --from=rigctld-builder /usr/local /usr/local
-ENV LD_LIBRARY_PATH="/usr/local/lib"
->>>>>>> d078273 (moved dockerfile for rigctld, added config stubs)
-CMD /bin/rigctld