diff --git a/.gitignore b/.gitignore
index 7b004e5..de1df2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+# ---> Python
+>>>>>>> c572a34cb4ba6d74ef88cda07e35e64b2ee5ab36
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -167,6 +171,7 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
+<<<<<<< HEAD
 # Abstra
 # Abstra is an AI-powered process automation framework.
 # Ignore directories containing user credentials, local state, and settings.
@@ -180,15 +185,20 @@ cython_debug/
 #  you could uncomment the following to ignore the enitre vscode folder
 # .vscode/
 
+=======
+>>>>>>> c572a34cb4ba6d74ef88cda07e35e64b2ee5ab36
 # Ruff stuff:
 .ruff_cache/
 
 # PyPI configuration file
 .pypirc
 
+<<<<<<< HEAD
 # Cursor
 #  Cursor is an AI-powered code editor. `.cursorignore` specifies files/directories to
 #  exclude from AI features like autocomplete and code analysis. Recommended for sensitive data
 #  refer to https://docs.cursor.com/context/ignore-files
 .cursorignore
-.cursorindexingignore
\ No newline at end of file
+.cursorindexingignore
+=======
+>>>>>>> c572a34cb4ba6d74ef88cda07e35e64b2ee5ab36
diff --git a/LICENSE b/LICENSE
index 4efe9c7..5558fa0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Fable3D License Agreement
 
 Copyright (c) 2025 Michał Lewandowski
@@ -18,3 +19,23 @@ This license does NOT grant you any rights to access the source code or make cha
 ---
 
 If you want to request additional rights or commercial licenses, please contact: slawek.1q2w3e4r@gmail.com
+=======
+MIT License
+
+Copyright (c) 2026 mmichlol
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
+associated documentation files (the "Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the 
+following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial 
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO 
+EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+>>>>>>> c572a34cb4ba6d74ef88cda07e35e64b2ee5ab36
diff --git a/README.md b/README.md
index aaefcd1..c2ed17d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # Fable3D
 
+<<<<<<< HEAD
 **Fable3D** is a lightweight, modular 3D engine written in Python — designed for game developers, simulation creators, and interactive world builders. It combines the simplicity of Python with powerful 3D rendering capabilities through OpenGL.
 
 > "Every game is a new story — start yours with Fable3D."
@@ -28,4 +29,6 @@
 Install dependencies with:
 
 ```bash
-pip install Fable3D
\ No newline at end of file
+pip install Fable3D
+=======
+>>>>>>> c572a34cb4ba6d74ef88cda07e35e64b2ee5ab36