Fix merge conflicts

Author: Athira M

packages/remote-config/src/api.ts

@@ -118,7 +118,10 @@ export async function activate(remoteConfig: RemoteConfig): Promise<boolean> {
     rc._storage.setActiveConfigTemplateVersion(
       lastSuccessfulFetchResponse.templateVersion
     ),
-    lastSuccessfulFetchResponse.experiments && experiment.updateActiveExperiments(lastSuccessfulFetchResponse.experiments),
+    lastSuccessfulFetchResponse.experiments &&
+      experiment.updateActiveExperiments(
+        lastSuccessfulFetchResponse.experiments
+      ),
     rc._storage.setActiveConfigEtag(lastSuccessfulFetchResponse.eTag)
   ]);
   return true;

packages/remote-config/test/api.test.ts

@@ -116,7 +116,7 @@ describe('Remote Config API', () => {
             entries: response.config,
             state: 'OK',
             templateVersion: response.templateVersion,
-            experimentDescriptions: response.experiments,
+            experimentDescriptions: response.experiments
           })
       } as Response)
     );

packages/remote-config/test/client/rest_client.test.ts

@@ -111,6 +111,7 @@ describe('RestClient', () => {
         status: expectedResponse.status,
         eTag: expectedResponse.eTag,
         config: expectedResponse.entries,
+        templateVersion: expectedResponse.templateVersion,
         experiments: expectedResponse.experimentDescriptions
       });
     });