.

frontend/package-lock.json

@@ -3968,18 +3968,6 @@
       "peerDependencies": {
         "react-native": ">=0.59"
       }
-<<<<<<< HEAD
-    },
-    "node_modules/@react-native-picker/picker": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@react-native-picker/picker/-/picker-2.4.1.tgz",
-      "integrity": "sha512-1XWy3IQgwr7MWd30KdY1iUh2gQZD+JiotN1ifj/ptFUYKon/0UFwngKQaWCO/CP/FdLl20/huSSLwKedYrdMMA==",
-      "peerDependencies": {
-        "react": "16 || 17",
-        "react-native": ">=0.57"
-      }
-=======
->>>>>>> a7a9d5d3add78ba5f3c20db3f2d330f56f73a488
     },
     "node_modules/@react-native-voice/voice": {
       "version": "3.2.3",
@@ -18355,15 +18343,12 @@
       "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-7.1.12.tgz",
       "integrity": "sha512-fkCRkOgzfdD0sr8JTasDgm716l8bJPkCNjXIyllG8K+UyixVa68lroQmgW9pewE5G5p43I9MWPtGZR/kVowBzg==",
       "requires": {}
-<<<<<<< HEAD
     },
     "@react-native-picker/picker": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/@react-native-picker/picker/-/picker-2.4.1.tgz",
       "integrity": "sha512-1XWy3IQgwr7MWd30KdY1iUh2gQZD+JiotN1ifj/ptFUYKon/0UFwngKQaWCO/CP/FdLl20/huSSLwKedYrdMMA==",
       "requires": {}
-=======
->>>>>>> a7a9d5d3add78ba5f3c20db3f2d330f56f73a488
     },
     "@react-native-voice/voice": {
       "version": "3.2.3",

frontend/src/screen/memory/MemoryResult.js

@@ -4,7 +4,7 @@ import {View, Text, StyleSheet} from 'react-native';
 const MemoryResult = () => {
     return(
         <View style={styles.screen}>
-            <Text>Result Screen</Text>
+            
         </View>
     );
 }

frontend/src/screen/memory/elementry/GameScreenFive.js

@@ -14,6 +14,7 @@ const GameScreenFive = ({navigation}) => {
                         style={styles.image}
                     />
                 </View>
+                <Text style={styles.imageText}>Fish</Text>
                 <CountDown
                     size={40}
                     until={Countdown.elementry}
@@ -27,7 +28,7 @@ const GameScreenFive = ({navigation}) => {
                     timeLabels={{s: 'Seconds'}}
                     style={styles.counter}
                 />
-                <Text style={styles.imageText}>Fish</Text>
+                
             </View>
         );
     }

frontend/src/screen/memory/elementry/GameScreenSix.js

@@ -14,7 +14,7 @@ const GameScreenSix = ({navigation}) => {
                         style={styles.image}
                     />
                 </View>
-                <Text style={styles.imageText}>Pencil</Text>
+                <Text style={styles.imageText}>Kite</Text>
                 <CountDown
                     size={40}
                     until={Countdown.elementry}