diff --git a/README.md b/README.md
index 9755fcd..a24e3b0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 LIGHTS (Localization of Infrared Geometry on Head Topology Suite)
 =================================================================
 
@@ -43,8 +42,3 @@ There are no conditions for Linux users at this time.
 LIGHTS is distributed under the GPL-3.0 license.
 
 Copyright (C) 2026 Tyler de Zeeuw
-=======
-# lights
-
-Localization of Infrared Geometry on Head Topology Suite
->>>>>>> accb119ea6d5a17fd42a4598581f89f4497e2dc6