Resolve merge conflicts

Author: sahil20021008

lib/node_modules/@stdlib/math/base/special/cbrtf/benchmark/c/native/benchmark.c

@@ -102,7 +102,7 @@ static double benchmark( void ) {
 
 	t = tic();
 	for ( i = 0; i < ITERATIONS; i++ ) {
-		y = stdlib_base_cbrtf( x[ i%(sizeof(x)/sizeof(x[0])) ] );
+		y = stdlib_base_cbrtf( x[ i%x.length ] );
 		if ( y != y ) {
 			printf( "should not return NaN\n" );
 			break;

lib/node_modules/@stdlib/math/base/special/gamma-lanczos-sum/benchmark/benchmark.js

@@ -21,7 +21,7 @@
 // MODULES //
 
 var bench = require( '@stdlib/bench' );
-var uniform = require( '@stdlib/random/array/uniform' );
+var uniform = require( '@stdlib/random/base/uniform' );
 var isnan = require( '@stdlib/math/base/assert/is-nan' );
 var pkg = require( './../package.json' ).name;
 var gammaLanczosSum = require( './../lib' );