Peering functionnal added
conflict fixed