fix merge conflicts

1 files changed, 6 insertions, 2 deletions

diff --git a/src/mail.c b/src/mail.c
index 4ec107011..658d37976 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -1,16 +1,20 @@
 #include "global.h"
 #include "mail.h"
-#include "asm.h"
+#include "easy_chat.h"
 #include "items.h"
+#include "mail_data.h"
 #include "menu.h"
+#include "menu_helpers.h"
 #include "name_string_util.h"
 #include "palette.h"
+#include "pokemon_icon.h"
 #include "rom4.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "strings2.h"
 #include "task.h"
 #include "text.h"
+#include "unknown_task.h"
 
 struct UnkMailStruct
 {
@@ -84,7 +88,7 @@ static void sub_80F8FB4(void);
 void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2)
 {
     u16 mailDesign;
-    u8 buffer[4];
+    u16 buffer[2];
 
     ewram0.varFF = GAME_LANGUAGE;
     ewram0.var100 = 1;