diff --git a/LICENSE b/LICENSE
index 761d5d3..f288702 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-TODO: Add your license here.
-=======
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -675,4 +672,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>.
->>>>>>> 282ef929d8e7e834a37c3baab45fbb910a5c3339