diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index f80bfd4eb3..c42a94ce98 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -3827,7 +3827,8 @@ msgstr ""
 #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h
 #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
 #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
-#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
+#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
+#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h
 #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
 #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
 #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c b/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c
index 5fca974e9e..1a8f297928 100644
--- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c
+++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/board.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2021 Dan Halbert for Adafruit Industries
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,15 +24,12 @@
  * THE SOFTWARE.
  */
 
+    << << << < HEAD: shared - module / keypad / __init__.h
+#ifndef SHARED_MODULE_KEYPAD_H
+#define SHARED_MODULE_KEYPAD_H
+== == == =
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
+    >> >> >> > adafruit / main: ports / atmel - samd / boards / sparkfun_samd51_micromod / board.c
 
-void board_init(void) {
-}
-
-bool board_requests_safe_mode(void) {
-    return false;
-}
-
-void reset_board(void) {
-}
+#endif // SHARED_MODULE_KEYPAD_H