Fix merge conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index ee8501d18..63af4c731 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -20,7 +20,7 @@ void ResetAllBgsCoordinates(void);
 void SetVBlankHBlankCallbacksToNull(void);
 void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
 bool16 RunTextPrintersRetIsActive(u8 textPrinterId);
-void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
+void DoYesNoFuncWithChoice(u8 taskId, const struct YesNoFuncTable *data);
 void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
 bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1);
 u8 GetLRKeysState(void);