diff --git a/WHENCE b/WHENCE
index ea6f4a60..5605cd68 100644
--- a/WHENCE
+++ b/WHENCE
@@ -2782,8 +2782,6 @@ Licence: Redistributable. See LICENCE.nvidia for details
 
 --------------------------------------------------------------------------
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 Driver: atusb - ATUSB IEEE 802.15.4 transceiver driver
 
 File: atusb/atusb-0.2.dfu