diff --git a/Containerfile b/Containerfile
index 4b0ab9b..4220e14 100644
--- a/Containerfile
+++ b/Containerfile
@@ -73,6 +73,7 @@ COPY --from=user-cpio . /
 COPY --from=user-mtools . /
 COPY --from=user-grub . /
 
+<<<<<<< HEAD
 FROM base as dev
 COPY --from=core-gcc . /
 COPY --from=core-zlib . /
@@ -96,6 +97,30 @@ COPY --from=core-curl . /
 COPY --from=user-libtpms . /
 COPY --from=user-tpm2-tss . /
 COPY --from=user-tpm2-tools . /
+=======
+FROM base AS dev
+COPY --from=gcc . /
+COPY --from=glib . /
+COPY --from=alsa-lib . /
+COPY --from=lzo . /
+COPY --from=dtc . /
+COPY --from=zlib . /
+COPY --from=numactl . /
+COPY --from=libaio . /
+COPY --from=libseccomp . /
+COPY --from=libffi . /
+COPY --from=libzstd . /
+COPY --from=libslirp . /
+COPY --from=seabios . /
+COPY --from=ipxe . /
+COPY --from=qemu . /
+COPY --from=swtpm . /
+COPY --from=openssl . /
+COPY --from=curl . /
+COPY --from=libtpms . /
+COPY --from=tpm2-tss . /
+COPY --from=tpm2-tools . /
+>>>>>>> 30df221 (fix casing for oci directive)
 
 FROM base AS build
 
diff --git a/Makefile b/Makefile
index 1214437..608df40 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,19 @@
 VERSION := development
 GIT_REF := $(shell git log -1 --format=%H)
 GIT_AUTHOR := $(shell git log -1 --format=%an)
-GIT_PUBKEY := $(shell git log -1 --format=%GP)
+GIT_PUBKEY := $(shell git log -1 --format=%GK)
 GIT_TIMESTAMP := $(shell git log -1 --format=%cd --date=iso)
 export
 
 ## Use env vars from latest release when reproducing
 ifdef REPRODUCE
-include dist/release.env
-export
+	include dist/release.env
+	export
 endif
+
+## Prevents use of caching when building docker image
 ifdef NOCACHE
-NO_CACHE := --no-cache
+	NO_CACHE := --no-cache
 endif
 
 .DEFAULT_GOAL :=
@@ -71,7 +73,7 @@ vm: out/dev-shell.digest out/airgap.iso out/sdcard.img
 			-nographic; \
 		"
 
-## Signing, Verification, and Release Targets
+## Release, Signing, Verification, and Reproduction Targets
 
 .PHONY: clean
 clean:
diff --git a/README.md b/README.md
index c02b0e6..810b841 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ make release
 ### Reproduce an existing release
 
 ```
-make attest
+make reproduce 
 ```
 
 ### Sign an existing release