diff --git a/package-lock.json b/package-lock.json
index d36a221..9802e28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,11 +18,15 @@
         "expo-status-bar": "~1.12.1",
         "react": "18.2.0",
         "react-native": "^0.74.5",
+<<<<<<< HEAD
 <<<<<<< HEAD
         "react-native-paper": "^5.12.5",
 =======
         "react-native-media-controls": "^2.3.0",
 >>>>>>> ece770c (fixed some style, tried video player a bit)
+=======
+        "react-native-paper": "^5.12.5",
+>>>>>>> aafcee1 (Charlottelaw/jdi 14 tab navigation (#12))
         "react-native-safe-area-context": "4.10.5",
         "react-native-screens": "3.31.1",
         "react-native-slider": "^0.11.0",
@@ -14460,6 +14464,9 @@
       }
     },
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> aafcee1 (Charlottelaw/jdi 14 tab navigation (#12))
     "node_modules/react-native-paper": {
       "version": "5.12.5",
       "resolved": "https://registry.npmjs.org/react-native-paper/-/react-native-paper-5.12.5.tgz",
@@ -14491,6 +14498,7 @@
       "integrity": "sha512-8nhb73STSD/z3GTHklvNjL8F9wMOo0bj0AFnulpIYuFTm6aQlT3ZcNbXF2YurKImIY8+kpSFSDHZZyQmurGrhw==",
       "peerDependencies": {
         "react": ">=16.8"
+<<<<<<< HEAD
 =======
     "node_modules/react-native-media-controls": {
       "version": "2.3.0",
@@ -14504,6 +14512,8 @@
         "react": ">=16",
         "react-native": ">=0.60"
 >>>>>>> ece770c (fixed some style, tried video player a bit)
+=======
+>>>>>>> aafcee1 (Charlottelaw/jdi 14 tab navigation (#12))
       }
     },
     "node_modules/react-native-safe-area-context": {
@@ -14529,6 +14539,9 @@
       }
     },
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> aafcee1 (Charlottelaw/jdi 14 tab navigation (#12))
     "node_modules/react-native-vector-icons": {
       "version": "10.2.0",
       "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-10.2.0.tgz",
@@ -14593,6 +14606,7 @@
       "peer": true,
       "engines": {
         "node": ">=10"
+<<<<<<< HEAD
 =======
     "node_modules/react-native-slider": {
       "version": "0.11.0",
@@ -14602,6 +14616,8 @@
       "dependencies": {
         "prop-types": "^15.5.6"
 >>>>>>> ece770c (fixed some style, tried video player a bit)
+=======
+>>>>>>> aafcee1 (Charlottelaw/jdi 14 tab navigation (#12))
       }
     },
     "node_modules/react-native-video": {
diff --git a/package.json b/package.json
index b24382d..73d194c 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,10 @@
     "react": "18.2.0",
     "react-native": "^0.74.5",
     "react-native-paper": "^5.12.5",
+<<<<<<< HEAD
     "react-native-media-controls": "^2.3.0",
+=======
+>>>>>>> aafcee1 (Charlottelaw/jdi 14 tab navigation (#12))
     "react-native-safe-area-context": "4.10.5",
     "react-native-screens": "3.31.1",
     "react-native-slider": "^0.11.0",