diff --git a/LICENSE b/LICENSE
index d48ec96..03b8ff3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 MIT License
 
 Copyright (c) 2024 Jason Meziere
@@ -695,4 +694,3 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
->>>>>>> 078fab0febd02aee34a8c40b8f0aee4fb6911ca1