Man who threatened neighbour with spade says they're now 'best friends'