fix conflicts

Author: juliaroldi

demo/scripts/controlsV2/demoButtons/createImageEditButtons.ts

@@ -62,7 +62,7 @@ function createImageFlipButton(handler: ImageEditor): RibbonButton<'buttonNameFl
             items: flipDirections,
         },
         isDisabled: formatState => !formatState.canAddImageAltText,
-        onClick: (editor, flipDirection) => {
+        onClick: (_editor, flipDirection) => {
             handler.flipImage(flipDirection as 'horizontal' | 'vertical');
         },
     };

demo/scripts/utils/imageEditOperator.ts

@@ -44,6 +44,9 @@ export interface FormatContentModelOptions {
      */
     scrollCaretIntoView?: boolean;
 
+    /**
+     * When true, selection change event will not be triggered bt formatContentModel function
+     */
     skipSelectionChangedEvent?: boolean;
 }