diff --git a/.mixin.out/audit/mixin_implementation_report.csv b/.mixin.out/audit/mixin_implementation_report.csv
deleted file mode 100644
index 41cb271..0000000
--- a/.mixin.out/audit/mixin_implementation_report.csv
+++ /dev/null
@@ -1 +0,0 @@
-Class,Method,Signature,Interface
diff --git a/.mixin.out/audit/mixin_implementation_report.txt b/.mixin.out/audit/mixin_implementation_report.txt
index d440bf5..cc7e8da 100644
--- a/.mixin.out/audit/mixin_implementation_report.txt
+++ b/.mixin.out/audit/mixin_implementation_report.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 Mixin Implementation Report generated on 2020-04-21 13:35:06
+=======
+Mixin Implementation Report generated on 2020-04-21 13:37:40
+>>>>>>> 40-phosphor
diff --git a/mods/phosphor-forge-mc1.15.2-0.5.2+build.4.jar b/mods/phosphor-forge-mc1.15.2-0.5.2+build.4.jar
new file mode 100644
index 0000000..2a575f8
Binary files /dev/null and b/mods/phosphor-forge-mc1.15.2-0.5.2+build.4.jar differ