fix merge conflicts

TODO.md

@@ -1,19 +1,12 @@
 ===========
 
 - Performance improrvement for getting latest save
-- Not enough space for text in attack menu
-
-===========
-
-- Add support for app refreshing when there is an update
-- We still have an update menu
-- Save not working
-
-===========
-
 - Should reset cursor position on menus when exiting
-- Add support for invisible items
 - Finish mt moon map
+- Text cuttoff with attacks
+
+===========
+
 - Add more maps
 - Implement escape rope
 - Gym leaders shouldn't auto encounter, you need to talk to them

src/components/GameboyMenu.tsx

@@ -18,6 +18,7 @@ const StyledGameboyMenu = styled.div`
   flex-direction: column;
   align-items: center;
   justify-content: space-evenly;
+  background: green;
 `;
 
 const colorAnimation = keyframes`

src/components/Menu.tsx

@@ -60,12 +60,6 @@ const ArrowContainer = styled.div`
   left: 0;
   top: 50%;
   transform: translateY(-50%);
-
-  @media (max-width: 1000px) {
-    top: auto;
-    bottom: -1px;
-    left: 1px;
-  }
 `;
 
 export interface MenuItemType {

src/components/StartMenu.tsx

@@ -20,7 +20,6 @@ import {
   selectPokemon,
 } from "../state/gameSlice";
 import PokemonList from "./PokemonList";
-import * as serviceWorkerRegistration from "../serviceWorkerRegistration";
 import { DEBUG_MODE } from "../app/constants";
 import { ItemType } from "../app/use-item-data";
 import { db } from "../app/db";
@@ -86,15 +85,6 @@ const StartMenu = () => {
               );
             },
           },
-          {
-            label: "Update",
-            action: () => {
-              // Our app is a PWA, the service worker caches the site.
-              // This action should remove the cache and load it again
-              serviceWorkerRegistration.unregister();
-              window.location.reload();
-            },
-          },
           ...(DEBUG_MODE
             ? [
                 {