Resolve conflicts in Dockerfiles

container/Makefile

@@ -1,8 +1,6 @@
-# # Pushing to the github registry requires a personal token with package
-# # permsions. Login is required as required:
-#
-# $ echo $GITHUB_TOKEN | podman login ghcr.io -u morloc-project --password-stdin
-
+# Pushing to the github registry requires a personal token with package
+# permissions. Login is required, for example:
+#   $ echo $GITHUB_TOKEN | podman login ghcr.io -u morloc-project --password-stdin
 
 ### WARNING: I am foolishly assuming here that the local morloc version is the
 ### same as the latest on github master.

container/full/Dockerfile

@@ -3,14 +3,9 @@ LABEL org.opencontainers.image.description="A morloc container intended for inte
 LABEL org.opencontainers.image.licenses=MIT
 
 FROM ubuntu:22.04
-<<<<<<< Updated upstream
-COPY --from=morloc-tiny /bin/morloc /bin/morloc
-=======
 COPY --from=ghcr.io/morloc-project/morloc/morloc-tiny:0.50.0 /bin/morloc /bin/morloc
 
 
->>>>>>> Stashed changes
-
 WORKDIR $HOME
 
 RUN apt-get update

container/tiny/Dockerfile

@@ -8,11 +8,7 @@ RUN apt-get update && apt-get install -y git curl pkg-config libglib2.0-dev
 RUN curl -SL https://get.haskellstack.org/ | sh
 
 # Get the latest morloc release
-<<<<<<< Updated upstream
-RUN git clone https://github.com/morloc-project/morloc && echo "hi"
-=======
 RUN git clone https://github.com/morloc-project/morloc
->>>>>>> Stashed changes
 
 # Build morloc
 RUN cd morloc && stack install