Resolved conflict in service/ghosties

Signed-off-by: Metanomad <root@vmi2223076.contaboserver.net>

service/ghosties

@@ -38,6 +38,17 @@ Public key (hex) for babe  : 0xe0f0a776ecc9fa5e1f22e2fa001fe3fba5aea52b9444bc894
 Public key (hex) for slow  : 0x0e6fa6934f9e99fa84874f2ed9318825a0d5443a0ced984acfbd24ece72ba55e
 Public key (hex) for gran  : 0xb63c5a0cf342b9b04931bc8ed74d7d0165ab99ab5f8a4514797d4b299a4501fe
 
+<<<<<<< HEAD
+### Neptune ###
+Local identity             : 12D3KooWJXBYA7cUQLLenEfT7hmCjBJ6fyikDy8YhNz4aLfwbBC8
+Public key (hex) wallet    : 0x6e4429a8fa85cfe2a60488af446d57e719207831b2579b937325645e110bb666
+===============================================================================================
+Public key (hex) for stash : 0x3a6626211a2dd35683fd7cb5f2f343d75f2b698d6c48c2d6eb1cdbe116e32315
+Public key (hex) for audi  : 0x86676ad3cd2d970b86dee2f25d4318f9bba40455111f16300e114e7f00c58706
+Public key (hex) for babe  : 0x6c0aec49974aaff08ff962a2d8d7857227d027ed27a272cbc4acaa1ee937db0f
+Public key (hex) for slow  : 0x009712519ba7dad1c682c871b94573ccaba8b7d530f7194fb16bf553fd7ae67d
+Public key (hex) for gran  : 0x935becdfb2e0d4fcd46ba82e680cfc447180de6b85ec42d17f1396a520b0c04f
+=======
 ### Metanomad ###
 Local identity             : 12D3KooWJASrFcdtDNpWfaNLdbjHJVMz7FStySNvi2iDvjeqWRTJ
 Public key (hex) wallet    : 0x385dc4812133d58e558e5483401807dbdb040717d09dedd51839ef37628f0362
@@ -47,3 +58,4 @@ Public key (hex) for audi  : 0x8618f3160621c67fcba8d147672998f7b8fea4f4cdf89bc4b
 Public key (hex) for babe  : 0x62e37d8b5990c7e45a1003e29898d2fc92d63616fbe24f7ba2fa8e862bf2e97a
 Public key (hex) for slow  : 0x1cada737675d125c16ab6180d3bede543de0519d6bb70e871cd55b197e31cf4d
 Public key (hex) for gran  : 0x492ae5b511805073e5adc66f51766b81c02450bcb5d3ef45e6b9cec7aa1b71c8
+>>>>>>> a33bbc7d976c806a0094a4212fd62292ba56d989