fix conflicts

Author: dplewis

types/Parse.d.ts

@@ -223,15 +223,21 @@ declare const Parse: {
             purge: (className: string) => Promise<any>;
             get: (className: string, options?: import("./RESTController").RequestOptions) => Promise<any>;
             delete: (className: string, options?: import("./RESTController").RequestOptions) => Promise<void>;
-            create: (className: string, params: any, options?: import("./RESTController").RequestOptions) => Promise<any>;
+            create: (className: string, params: any, options? /**
+             * @member {string} Parse.maintenanceKey
+             * @static
+             */: import("./RESTController").RequestOptions) => Promise<any>;
             update: (className: string, params: any, options?: import("./RESTController").RequestOptions) => Promise<any>;
             send(className: string, method: string, params: any, options?: import("./RESTController").RequestOptions): Promise<any>;
         }): void;
         getSchemaController(): {
             purge: (className: string) => Promise<any>;
             get: (className: string, options?: import("./RESTController").RequestOptions) => Promise<any>;
             delete: (className: string, options?: import("./RESTController").RequestOptions) => Promise<void>;
-            create: (className: string, params: any, options?: import("./RESTController").RequestOptions) => Promise<any>;
+            create: (className: string, params: any, options? /**
+             * @member {string} Parse.maintenanceKey
+             * @static
+             */: import("./RESTController").RequestOptions) => Promise<any>;
             update: (className: string, params: any, options?: import("./RESTController").RequestOptions) => Promise<any>;
             send(className: string, method: string, params: any, options?: import("./RESTController").RequestOptions): Promise<any>;
         };
@@ -487,7 +493,7 @@ declare const Parse: {
      * @static
      */
     initialize(applicationId: string, javaScriptKey: string): void;
-    _initialize(applicationId: string, javaScriptKey: string, masterKey?: string): void;
+    _initialize(applicationId: string, javaScriptKey: string, masterKey?: string, maintenanceKey?: string): void;
     /**
      * Call this method to set your AsyncStorage engine
      * Starting [email protected], the ParseSDK do not provide a React AsyncStorage as the ReactNative module
@@ -527,6 +533,11 @@ declare const Parse: {
      * @static
      */
     masterKey: any;
+    /**
+     * @member {string} Parse.maintenanceKey
+     * @static
+     */
+    maintenanceKey: any;
     /**
      * @member {string} Parse.serverURL
      * @static

types/ParseQuery.d.ts

@@ -6,6 +6,7 @@ import type { Pointer } from './ParseObject';
 type BatchOptions = FullOptions & {
     batchSize?: number;
     useMasterKey?: boolean;
+    useMaintenanceKey?: boolean;
     sessionToken?: string;
     context?: {
         [key: string]: any;

types/RESTController.d.ts

@@ -1,5 +1,6 @@
 export type RequestOptions = {
     useMasterKey?: boolean;
+    useMaintenanceKey?: boolean;
     sessionToken?: string;
     installationId?: string;
     returnStatus?: boolean;
@@ -15,6 +16,7 @@ export type FullOptions = {
     success?: any;
     error?: any;
     useMasterKey?: boolean;
+    useMaintenanceKey?: boolean;
     sessionToken?: string;
     installationId?: string;
     progress?: any;