hidden error!

@@ -2,7 +2,7 @@
   "devToolsPort": 19002,
   "expoServerPort": 19000,
   "packagerPort": 19001,
-  "packagerPid": 14768,
+  "packagerPid": 13860,
   "expoServerNgrokUrl": "https://x2-7pb.anonymous.searchguide.exp.direct",
   "packagerNgrokUrl": "https://packager.x2-7pb.anonymous.searchguide.exp.direct",
   "ngrokPid": 9336

 {
-  "hostType": "tunnel",
+  "hostType": "lan",
   "lanType": "ip",
   "dev": true,
   "minify": false,

@@ -5,11 +5,7 @@
     "privacy": "public",
     "sdkVersion": "35.0.0",
     "androidStatusBar": {
-<<<<<<< HEAD
-      "backgroundColor": "#20272F"
-=======
       "backgroundColor": "#2C658E"
->>>>>>> master
     },
     "platforms": [
       "ios",