fix record mixing merge conflicts

1 files changed, 1 insertions, 0 deletions

diff --git a/ld_script.txt b/ld_script.txt
index d053e670e..e75c810a9 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -144,6 +144,7 @@ SECTIONS {
         src/naming_screen.o(.text);
         src/money.o(.text);
         asm/contest_effect.o(.text);
+        src/record_mixing.o(.text);
         asm/record_mixing.o(.text);
         src/secret_base.o(.text);
         src/tv.o(.text);