Update CHANGELOG.md

CHANGELOG.md

@@ -7,16 +7,7 @@
 
 # [7.4.12]
 - Update the minimum version of device_info_plus to 9.1.0.
-<<<<<<< HEAD
-<<<<<<< HEAD
-- Custom style attrbuites for platforms other than mobile (alignment, margin, width, height)
-- Improve performance by reducing the number of widgets rebuilt by listening to media query for only the needed things, for example instead of using `MediaQuery.of(context).size`, now we are using `MediaQuery.sizeOf(context)`
-=======
->>>>>>> 956c56c (Update CHANGELOG.md to fix conflict)
-- 
-=======
 
->>>>>>> 14fb52b (Fix conflict)
 # [7.4.11]
 - Add sw locale.
 

flutter_quill_extensions/CHANGELOG.md

@@ -8,6 +8,8 @@
 - Add QuillImageUtilities class
 - Small improvemenets
 - Allow to use the mobile context menu on desktop by force using it
+- Add the resizing option to the forced mobile context menu
+- Add new custom style attrbuite for desktop and other platforms
 
 ## 0.5.0
 - Migrated from `gallery_saver` to `gal` for saving images