diff --git a/LICENSE b/LICENSE
index 92de3d0..dbbe355 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,11 +1,7 @@
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
-<<<<<<< HEAD
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-=======
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
->>>>>>> origin/nerdvpn
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -647,11 +643,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-<<<<<<< HEAD
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=======
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
->>>>>>> origin/nerdvpn
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -666,8 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<<<<<<< HEAD
 <http://www.gnu.org/licenses/>.
-=======
-<https://www.gnu.org/licenses/>.
->>>>>>> origin/nerdvpn