Fix merge conflicts

Author: dwyfrequency

packages/analytics-compat/package.json

@@ -24,13 +24,8 @@
     "@firebase/app-compat": "0.x"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app-compat": "0.1.37",
-    "rollup": "2.72.1",
-=======
-    "@firebase/app-compat": "0.1.36",
     "rollup": "2.79.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.34.1",
     "typescript": "4.2.2"

packages/app-check-compat/package.json

@@ -44,13 +44,8 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app-compat": "0.1.37",
-    "rollup": "2.72.1",
-=======
-    "@firebase/app-compat": "0.1.36",
     "rollup": "2.79.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",

packages/app-check/package.json

@@ -45,13 +45,8 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app": "0.8.2",
-    "rollup": "2.72.1",
-=======
-    "@firebase/app": "0.8.1",
     "rollup": "2.79.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-node-resolve": "13.3.0",

packages/messaging/package.json

@@ -62,15 +62,9 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app": "0.8.2",
-    "rollup": "2.72.1",
-    "rollup-plugin-typescript2": "0.31.2",
-=======
-    "@firebase/app": "0.8.1",
     "rollup": "2.79.1",
     "rollup-plugin-typescript2": "0.34.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-json": "4.1.0",
     "ts-essentials": "9.3.0",
     "typescript": "4.2.2"

packages/performance/package.json

@@ -47,13 +47,8 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app": "0.8.2",
-    "rollup": "2.72.1",
-=======
-    "@firebase/app": "0.8.1",
     "rollup": "2.79.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.34.1",
     "typescript": "4.2.2"

packages/remote-config/package.json

@@ -49,15 +49,9 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app": "0.8.2",
-    "rollup": "2.72.1",
-    "rollup-plugin-typescript2": "0.31.2",
-=======
-    "@firebase/app": "0.8.1",
     "rollup": "2.79.1",
     "rollup-plugin-typescript2": "0.34.1",
->>>>>>> f51379262 (Update rollup deps)
     "typescript": "4.2.2"
   },
   "repository": {

packages/storage-compat/package.json

@@ -45,15 +45,9 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app-compat": "0.1.37",
     "@firebase/auth-compat": "0.2.23",
-    "rollup": "2.72.1",
-=======
-    "@firebase/app-compat": "0.1.36",
-    "@firebase/auth-compat": "0.2.22",
     "rollup": "2.79.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.34.1",
     "typescript": "4.2.2"

packages/storage/package.json

@@ -51,15 +51,9 @@
     "@firebase/app": "0.x"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app": "0.8.2",
     "@firebase/auth": "0.20.10",
-    "rollup": "2.72.1",
-=======
-    "@firebase/app": "0.8.1",
-    "@firebase/auth": "0.20.9",
     "rollup": "2.79.1",
->>>>>>> f51379262 (Update rollup deps)
     "@rollup/plugin-alias": "3.1.9",
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.34.1",

packages/template/package.json

@@ -45,15 +45,9 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-<<<<<<< HEAD
     "@firebase/app": "0.8.2",
-    "rollup": "2.72.1",
-    "rollup-plugin-typescript2": "0.31.2",
-=======
-    "@firebase/app": "0.8.1",
     "rollup": "2.79.1",
     "rollup-plugin-typescript2": "0.34.1",
->>>>>>> f51379262 (Update rollup deps)
     "typescript": "4.2.2"
   },
   "repository": {