Update LICENSE

LICENSE

@@ -3,9 +3,6 @@
 
     TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-1. Rights of use
-
-<<<<<<< HEAD
 1. Rights of use
 
   You may use, modify and redistribute this Python script ("Software")
@@ -20,23 +17,7 @@ purpose without the prior written consent of the Author.
 to attribute authorship as follows:  
     - Mention the author's github (https://github.com/PalmaLuv).
     - Include a link to the source repository or other source where 
-the original code of the Software is available.
-=======
-  You may use, modify and redistribute this Python script ("Software")
-under the terms of this license.
-
-2. Limitations
-
-    2.1 You may not sell the Software or use it for any commercial 
-purpose without the prior written consent of the Author.
-
-    2.2 When distributing the Software you are required 
-to attribute authorship as follows: 
-
-      - Mention the author's github (https://github.com/PalmaLuv).
-      - Include a link to the source repository or other source where 
-        the original code of the Software is available.
->>>>>>> main
+      the original code of the Software is available.
 
 3. Guarantees and liability
 
@@ -46,8 +27,4 @@ using this application.
 4. Consent to license
 
   By using, modifying or distributing the Software, you agree 
-<<<<<<< HEAD
-to the terms of this license.
-=======
 to the terms of this license.
->>>>>>> main