diff --git a/data/person/CPBARNES-DN42 b/data/person/CPBARNES-DN42
index af7d75317..09028cc3d 100644
--- a/data/person/CPBARNES-DN42
+++ b/data/person/CPBARNES-DN42
@@ -3,4 +3,8 @@ nic-hdl:            CPBARNES-DN42
 mnt-by:             CPBARNES-MNT
 e-mail:             chris.p.barnes@gmail.com
 source:             DN42
+<<<<<<< HEAD
 pgp-fingerprint:    5EE7FE3C69F44CD34AFD0C64ADF07443C7CFDA87
+=======
+pgp-fingerprint 5EE7FE3C69F44CD34AFD0C64ADF07443C7CFDA87
+>>>>>>> fe29433a1a277ffb27c7e42c07f94ed1dab5cc8e