diff --git a/service/ghosties b/service/ghosties
index 1bb68f0..2198022 100644
--- a/service/ghosties
+++ b/service/ghosties
@@ -37,6 +37,7 @@ Public key (hex) for audi  : 0x2cf69452e9f2a8457119139408884941ed50f590c0fc0f2b0
 Public key (hex) for babe  : 0xe0f0a776ecc9fa5e1f22e2fa001fe3fba5aea52b9444bc894b45589d42132475
 Public key (hex) for slow  : 0x0e6fa6934f9e99fa84874f2ed9318825a0d5443a0ced984acfbd24ece72ba55e
 Public key (hex) for gran  : 0xb63c5a0cf342b9b04931bc8ed74d7d0165ab99ab5f8a4514797d4b299a4501fe
+<<<<<<< HEAD
 
 ### Neptune 2 ###
 Local identity             : 12D3KooWPQXpz8UM9uBsB7pcv12pLCLbYdk8W3SHrZBgiju2fbAs
@@ -197,3 +198,5 @@ Public key (hex) audi      : 0x3680593818dfa5ed287de4320f730ae22f2a9c05ebebfad93
 Public key (hex) babe      : 0x3477d5cb7f3dffb8d76a33f32bcbcb5669f992d56ab222cfa0ab496b5b8bff12
 Public key (hex) slow      : 0x1cf9b6843abd08eee9f99c5db2c9546fa72ef603a5db0e3c9372e63ec6bb6a06
 Public key (hex) gran      : 0x3a539da581ced44fe567f9dee8a037fbd6cbe5027afe0c1099e3df0a621f030a
+=======
+