fix

Author: SnorreFossland

LICENSE copy.md

@@ -4,8 +4,17 @@
 ![TypeScript](https://img.shields.io/badge/TypeScript-4.0+-3178C6?logo=typescript)
 ![Next.js](https://img.shields.io/badge/Next.js-13.0+-000000?logo=next.js)
 
+<<<<<<< HEAD
 Open-source Modelling tool with Graphical Diagram Editor using Cyclic Entity-based Modeling and Metamodelling capabilities.
 <!-- <img src="https://github.com/user-attachments/assets/ea2b6b9a-f8cc-4916-aa00-3e8693015fd3" alt="Image Description" width="200" /> -->
+=======
+Open-source Modelling tool with Graphical Diagram Editor using Cyclic   Entity-based Modeling and Metamodelling capabilities.
+![3B161451-6FAC-43C6-9763-ADA43329ECD7_1_105_c](https://github.com/user-attachments/assets/ea2b6b9a-f8cc-4916-aa00-3e8693015fd3)
+
+![App Screenshot](./public/images/MimrisApp.png)
+
+[Powered by GoJS](https://gojs.net)
+>>>>>>> 5309607e6bc14960eb09d70fc1107799f4189a78
 
 ## Table of Contents
 

README.md

@@ -66,4 +66,11 @@
 
 ---
 
-Back to [README.md](../README.md)
+<<<<<<< HEAD
+Back to [README.md](../README.md)
+=======
+- [Ben Awad![Ben Awad](https://yt3.ggpht.com/ytc/AMLnZu9BenAwadImage=s88-c-k-c0x00ffffff-no-rj)](https://www.youtube.com/@BenAwad)
+
+Traversy Metdia
+
+>>>>>>> 5309607e6bc14960eb09d70fc1107799f4189a78

docs/AUTHORS.md

@@ -1,10 +1,7 @@
 # Changelog
 
-## [2.1.0] - 2023-08-20
+## [1.1.0] - 2025-04-09
 ### Added
-- Node grouping functionality
-- Plugin version checker
-
+- Establish Mimris and copied all code from AKMM
 ### Fixed
-- Memory leak in undo stack
-...
+- Renamed AKMM to Mimris in user interface

docs/CHANGELOG.md

@@ -37,6 +37,8 @@ Branch Strategy
 Create a new branch from main:
 
 git checkout -b feat/your-feature-name
+
+```
 Use conventional branch prefixes:
 
 feat/: New features
@@ -46,15 +48,51 @@ refactor/: Code improvements
 💻 Development Workflow
 Running the App
 # Start development server
+<<<<<<< HEAD
 npm dev
+=======
+npm run dev
+>>>>>>> 5309607e6bc14960eb09d70fc1107799f4189a78
 
 # Build production bundle
 npm run build
 📐 Technology-Specific Guidelines
 TypeScript
 Strict mode enabled (strict: true in tsconfig)
 
+<<<<<<< HEAD
 Update documentation if needed
+=======
+All components must have TypeScript interfaces
+
+Use generics with Redux hooks:
+
+const dispatch = useAppDispatch<AppDispatch>();
+Redux Toolkit
+Create slices in src/store/features
+
+Use RTK Query for API interactions
+
+Follow this slice structure:
+
+export const diagramSlice = createSlice({
+  name: 'diagram',
+  initialState,
+  reducers: {
+    addNode: (state, action: PayloadAction<Node>) => {
+      // Immutable updates only
+    }
+  },
+  extraReducers(builder) {
+    // Add async reducers
+  }
+});
+
+Next.js Pages
+Client components in src/components
+Dynamic routes follow [param]/page.tsx convention
+documentation if needed
+>>>>>>> 5309607e6bc14960eb09d70fc1107799f4189a78
 
 Include screenshots for UI changes
 
@@ -64,6 +102,13 @@ Describe changes in conventional commit format:
 Updating Docs
 Modify Markdown files in /docs
 
+<<<<<<< HEAD
+=======
+🆘 Need Help?
+Join our Discord Server
+Ask in GitHub Discussions
+Attend our weekly Office Hours (Wednesdays 3PM UTC)
+>>>>>>> 5309607e6bc14960eb09d70fc1107799f4189a78
 🙌 Thank you for contributing to GraphicModelingApp! Your work helps build better creative tools for everyone.
 
 This guide includes:
@@ -75,3 +120,7 @@ This guide includes:
 6. Community support channels
 
 Would you like me to add any specific section or modify the existing content?
+
+##aknowledgements
+
+