diff --git a/include/sf64audio_provisional.h b/include/sf64audio_provisional.h
index 1169b2e8..564e63b3 100644
--- a/include/sf64audio_provisional.h
+++ b/include/sf64audio_provisional.h
@@ -1040,8 +1040,8 @@ uintptr_t AudioHeap_SearchCaches(s32 tableType, s32 cache, s32 id);
 s32 AudioHeap_ResetStep(void);
 void* AudioHeap_SearchPermanentCache(s32 tableType, s32 id);
 u8* AudioHeap_AllocPermanent(s32 tableType, s32 id, u32 size);
-void* AudioHeap_AllocTemporarySampleCache(s32 size, s32 fontId, s32 sampleAddr, s8 medium);
-void* AudioHeap_AllocPersistentSampleCache(s32 size, s32 fontId, s32 sampleAddr, s8 medium);
+void* AudioHeap_AllocTemporarySampleCache(s32 size, s32 fontId, uintptr_t sampleAddr, s8 medium);
+void* AudioHeap_AllocPersistentSampleCache(s32 size, s32 fontId, uintptr_t sampleAddr, s8 medium);
 
 // audio_load
 void AudioLoad_DecreaseSampleDmaTtls(void);
diff --git a/src/engine/fox_std_lib.c b/src/engine/fox_std_lib.c
index b10289b8..dac86d0d 100644
--- a/src/engine/fox_std_lib.c
+++ b/src/engine/fox_std_lib.c
@@ -599,11 +599,7 @@ void Lib_TextureRect_CI8(Gfx** gfxPtr, u8* texture, u16* palette, u32 width, u32
                         (s32) (1.0f / yScale * 1024.0f));
 }
 
-<<<<<<< HEAD
 void Lib_TextureRect_RGBA16(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
-=======
-void TextureRect_RGBA16(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
                          f32 yScale) {
     gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP,
                      G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -617,11 +613,7 @@ void TextureRect_RGBA16(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32
                         (s32) (1.0f / yScale * 1024.0f));
 }
 
-<<<<<<< HEAD
 void Lib_TextureRect_RGBA16_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
-=======
-void TextureRect_RGBA16_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale,
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
                               f32 yScale) {
     gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP,
                      G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -635,11 +627,7 @@ void TextureRect_RGBA16_MirX(Gfx** gfxPtr, void* texture, u32 width, u32 height,
                         (u16) (s32) (-1.0f / xScale * 1024.0f), (s32) (1.0f / yScale * 1024.0f));
 }
 
-<<<<<<< HEAD
 void Lib_TextureRect_IA8(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
-=======
-void TextureRect_IA8(Gfx** gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
     gDPSetTileCustom((*gfxPtr)++, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP,
                      G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
diff --git a/src/mods/sfxjukebox2.c b/src/mods/sfxjukebox2.c
index 3ac9d414..270d577b 100644
--- a/src/mods/sfxjukebox2.c
+++ b/src/mods/sfxjukebox2.c
@@ -42,7 +42,7 @@ void Jukebox_SelectWrap(u32* option, s32 range) {
     *option = (*option + range) % range;
 }
 
-Jukebox_SelectClamp(s32* option, s32 range, s32 skip) {
+void Jukebox_SelectClamp(s32* option, s32 range, s32 skip) {
     OSContPad* contPress = &gControllerPress[gMainController];
     OSContPad* contHold = &gControllerHold[gMainController];