merge CPAN version 0.004003