diff --git a/mobile/app.json b/mobile/app.json
index b6f050c8..1aa4aef0 100644
--- a/mobile/app.json
+++ b/mobile/app.json
@@ -22,7 +22,6 @@
         "NSCameraUsageDescription": "DocuElevate uses the camera to capture documents for upload.",
         "NSPhotoLibraryUsageDescription": "DocuElevate accesses your photo library to select documents for upload.",
         "NSPhotoLibraryAddUsageDescription": "DocuElevate saves scanned documents to your photo library.",
-<<<<<<< Updated upstream
         "UIBackgroundModes": ["fetch", "remote-notification"],
         "ITSAppUsesNonExemptEncryption": false,
         "LSSupportsOpeningDocumentsInPlace": true,
@@ -48,15 +47,6 @@
         ]
       },
       "buildNumber": "7"
-=======
-        "UIBackgroundModes": [
-          "fetch",
-          "remote-notification"
-        ],
-        "ITSAppUsesNonExemptEncryption": false
-      },
-      "buildNumber": "6"
->>>>>>> Stashed changes
     },
     "android": {
       "adaptiveIcon": {
@@ -105,13 +95,7 @@
         {
           "icon": "./assets/notification-icon.png",
           "color": "#1e40af",
-<<<<<<< Updated upstream
           "sounds": ["./assets/notification_sound.wav"]
-=======
-          "sounds": [
-            "./assets/notification-sound.wav"
-          ]
->>>>>>> Stashed changes
         }
       ],
       [