resolve master merge conflict

src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.ts

@@ -733,15 +733,16 @@ export class D3ForceGraph implements GraphRenderer {
       .attr("aria-label", (d: D3Node) => {
         return this.retrieveNodeCaption(d);
       })
-      .on("dblclick", function (_: MouseEvent, d: D3Node) {
+      .on("dblclick", function (this: Element, _: MouseEvent, d: D3Node) {
+        // https://stackoverflow.com/a/41945742 ('this' implicitly has type 'any' because it does not have a type annotation)
         // this is the <g> element
         self.onNodeClicked(this.parentNode, d);
       })
-      .on("click", function (_: MouseEvent, d: D3Node) {
+      .on("click", function (this: Element, _: MouseEvent, d: D3Node) {
         // this is the <g> element
         self.onNodeClicked(this.parentNode, d);
       })
-      .on("keypress", function (event: KeyboardEvent, d: D3Node) {
+      .on("keypress", function (this: Element, event: KeyboardEvent, d: D3Node) {
         if (event.charCode === Constants.KeyCodes.Space || event.charCode === Constants.KeyCodes.Enter) {
           event.stopPropagation();
           // this is the <g> element

src/Explorer/Panes/RightPaneForm/RightPaneForm.test.tsx

@@ -22,7 +22,6 @@ describe("Load Query Pane", () => {
     wrapper = mount(<RightPaneForm {...props} />);
     expect(wrapper).toMatchSnapshot();
   });
-
   it("should call submit method enter in form", () => {
     render(<RightPaneForm {...props} />);
     fireEvent.click(screen.getByTestId("submit"));

src/Explorer/Panes/RightPaneForm/RightPaneForm.tsx

@@ -1,15 +1,30 @@
+<<<<<<< HEAD
 import React, { FunctionComponent, ReactNode } from "react";
 import { PanelFooterComponent } from "../PanelFooterComponent";
 import { PanelInfoErrorComponent, PanelInfoErrorProps } from "../PanelInfoErrorComponent";
 import { PanelLoadingScreen } from "../PanelLoadingScreen";
+=======
+import { IconButton } from "@fluentui/react";
+import React, { FunctionComponent, ReactNode } from "react";
+import { KeyCodes } from "../../../Common/Constants";
+>>>>>>> 487fbf207299bfd3b7d6404bf0307a8de29ac987
 
 export interface RightPaneFormProps {
   expandConsole: () => void;
   formError: string;
   formErrorDetail: string;
+<<<<<<< HEAD
   isExecuting: boolean;
   onSubmit: () => void;
   submitButtonText: string;
+=======
+  id: string;
+  isExecuting: boolean;
+  onClose: () => void;
+  onSubmit: () => void;
+  submitButtonText: string;
+  title: string;
+>>>>>>> 487fbf207299bfd3b7d6404bf0307a8de29ac987
   isSubmitButtonHidden?: boolean;
   children?: ReactNode;
 }

src/Explorer/Panes/__snapshots__/DeleteDatabaseConfirmationPanel.test.tsx.snap

@@ -1288,7 +1288,7 @@ exports[`Delete Database Confirmation Pane submit() Should call delete database
       <Stack
         className="panelInfoErrorContainer"
         horizontal={true}
-        verticalAlign="center"
+        verticalAlign="start"
       >
         <div
           className="ms-Stack panelInfoErrorContainer css-202"
@@ -1296,12 +1296,14 @@ exports[`Delete Database Confirmation Pane submit() Should call delete database
           <StyledIconBase
             aria-label="warning"
             className="panelWarningIcon"
+            data-testid="warningIcon"
             iconName="WarningSolid"
             key=".0:$.0"
           >
             <IconBase
               aria-label="warning"
               className="panelWarningIcon"
+              data-testid="warningIcon"
               iconName="WarningSolid"
               styles={[Function]}
               theme={
@@ -1582,7 +1584,11 @@ exports[`Delete Database Confirmation Pane submit() Should call delete database
                 aria-label="warning"
                 className="panelWarningIcon root-204"
                 data-icon-name="WarningSolid"
+<<<<<<< HEAD
                 role="img"
+=======
+                data-testid="warningIcon"
+>>>>>>> 487fbf207299bfd3b7d6404bf0307a8de29ac987
               >
                 
               </i>
@@ -1595,11 +1601,13 @@ exports[`Delete Database Confirmation Pane submit() Should call delete database
             <Text
               aria-label="message"
               className="panelWarningErrorMessage"
+              data-testid="panelmessage"
               variant="small"
             >
               <span
                 aria-label="message"
                 className="panelWarningErrorMessage css-205"
+                data-testid="panelmessage"
               >
                 Warning! The action you are about to take cannot be undone. Continuing will permanently delete this resource and all of its children resources.
               </span>