fix: resolve conflits after rebase with main

Author: lukewalczak

src/components/Button/Button.tsx

@@ -346,12 +346,8 @@ const Button = (
           style,
         ] as Animated.WithAnimatedValue<StyleProp<ViewStyle>>
       }
-<<<<<<< HEAD
-      {...(isV3 && { elevation: elevation })}
-      container
-=======
       elevation={elevation}
->>>>>>> e44bc5a3f (refactor: remove `isV3` and MD2 from components (#4727))
+      container
     >
       <TouchableRipple
         borderless

src/components/Card/Card.tsx

@@ -290,20 +290,7 @@ const Card = (
     <Surface
       ref={ref}
       style={[
-<<<<<<< HEAD
-        isV3 && !isMode('elevated') && { backgroundColor },
-        !isV3 &&
-          (isMode('outlined')
-            ? styles.resetElevation
-            : {
-                elevation: computedElevation as unknown as number,
-              }),
-=======
         !isMode('elevated') && { backgroundColor },
-        {
-          elevation: computedElevation as unknown as number,
-        },
->>>>>>> e44bc5a3f (refactor: remove `isV3` and MD2 from components (#4727))
         borderRadiusCombinedStyles,
         style,
       ]}

src/components/IconButton/IconButton.tsx

@@ -179,12 +179,8 @@ const IconButton = forwardRef<View, Props>(
           borderStyles,
           style,
         ]}
-<<<<<<< HEAD
         container
-        {...(isV3 && { elevation: 0 })}
-=======
         elevation={0}
->>>>>>> e44bc5a3f (refactor: remove `isV3` and MD2 from components (#4727))
       >
         <TouchableRipple
           borderless

yarn.lock

@@ -4557,13 +4557,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native/normalize-colors@npm:0.77.2":
-  version: 0.77.2
-  resolution: "@react-native/normalize-colors@npm:0.77.2"
-  checksum: 10c0/e2d542c066f292271ea6680c72067cb08ee87e6556a3d2f62636f4bf396c067beb7f4c447d97ab2a94e78066be53fab2634f5deecc9b874bb1caae4c78dc9a9a
-  languageName: node
-  linkType: hard
-
 "@react-native/normalize-colors@npm:^0.74.1":
   version: 0.74.89
   resolution: "@react-native/normalize-colors@npm:0.74.89"
@@ -4588,23 +4581,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-native/virtualized-lists@npm:0.77.2":
-  version: 0.77.2
-  resolution: "@react-native/virtualized-lists@npm:0.77.2"
-  dependencies:
-    invariant: "npm:^2.2.4"
-    nullthrows: "npm:^1.1.1"
-  peerDependencies:
-    "@types/react": ^18.2.6
-    react: "*"
-    react-native: "*"
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 10c0/299b67f5bba57bb119aef9d1f9ff8d9acdf6026e2df33f698c8f308b80c148b0f1ec4f171c44af2174af0f582851a11a0f33e26bc4412c9657d9798b33996b2c
-  languageName: node
-  linkType: hard
-
 "@react-navigation/bottom-tabs@npm:^7.3.10":
   version: 7.3.12
   resolution: "@react-navigation/bottom-tabs@npm:7.3.12"
@@ -20011,59 +19987,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native@npm:0.77.2":
-  version: 0.77.2
-  resolution: "react-native@npm:0.77.2"
-  dependencies:
-    "@jest/create-cache-key-function": "npm:^29.6.3"
-    "@react-native/assets-registry": "npm:0.77.2"
-    "@react-native/codegen": "npm:0.77.2"
-    "@react-native/community-cli-plugin": "npm:0.77.2"
-    "@react-native/gradle-plugin": "npm:0.77.2"
-    "@react-native/js-polyfills": "npm:0.77.2"
-    "@react-native/normalize-colors": "npm:0.77.2"
-    "@react-native/virtualized-lists": "npm:0.77.2"
-    abort-controller: "npm:^3.0.0"
-    anser: "npm:^1.4.9"
-    ansi-regex: "npm:^5.0.0"
-    babel-jest: "npm:^29.7.0"
-    babel-plugin-syntax-hermes-parser: "npm:0.25.1"
-    base64-js: "npm:^1.5.1"
-    chalk: "npm:^4.0.0"
-    commander: "npm:^12.0.0"
-    event-target-shim: "npm:^5.0.1"
-    flow-enums-runtime: "npm:^0.0.6"
-    glob: "npm:^7.1.1"
-    invariant: "npm:^2.2.4"
-    jest-environment-node: "npm:^29.6.3"
-    jsc-android: "npm:^250231.0.0"
-    memoize-one: "npm:^5.0.0"
-    metro-runtime: "npm:^0.81.3"
-    metro-source-map: "npm:^0.81.3"
-    nullthrows: "npm:^1.1.1"
-    pretty-format: "npm:^29.7.0"
-    promise: "npm:^8.3.0"
-    react-devtools-core: "npm:^6.0.1"
-    react-refresh: "npm:^0.14.0"
-    regenerator-runtime: "npm:^0.13.2"
-    scheduler: "npm:0.24.0-canary-efb381bbf-20230505"
-    semver: "npm:^7.1.3"
-    stacktrace-parser: "npm:^0.1.10"
-    whatwg-fetch: "npm:^3.0.0"
-    ws: "npm:^6.2.3"
-    yargs: "npm:^17.6.2"
-  peerDependencies:
-    "@types/react": ^18.2.6
-    react: ^18.2.0
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  bin:
-    react-native: cli.js
-  checksum: 10c0/ff7fca588766c1bc7a7ff2fa574e07d2ec16f8b64f4c7600980231e604c2c05918df38665fb1c57a656975ca7e81c42846549839db9da4eed8e8cacd8decc475
-  languageName: node
-  linkType: hard
-
 "react-refresh@npm:^0.14.0, react-refresh@npm:^0.14.2":
   version: 0.14.2
   resolution: "react-refresh@npm:0.14.2"