Finish merge

native.js

@@ -1,7 +1,6 @@
 import { dirname, join, default as pathModule } from 'path';
 import { fileURLToPath } from 'url';
 import loadNAPI from 'node-gyp-build-optional-packages';
-<<<<<<< HEAD
 export let Env,
 	Txn,
 	Dbi,

open.js

@@ -68,12 +68,8 @@ export function open(path, options) {
 	let isLegacyLMDB = version.patch < 90;
 	let remapChunks = (options.remapChunks || options.encryptionKey || (options.mapSize ?
 		(is32Bit && options.mapSize > 0x100000000) : // larger than fits in address space, must use dynamic maps
-<<<<<<< HEAD
-		is32Bit); // without a known map size, we default to being able to handle large data correctly/well*/
-	let userMapSize = options.mapSize;
-=======
 		is32Bit)) && !isLegacyLMDB; // without a known map size, we default to being able to handle large data correctly/well*/
->>>>>>> ebb5046 (Adjust tests and settings for V1)
+	let userMapSize = options.mapSize;
 	options = Object.assign({
 		noSubdir: Boolean(extension),
 		isRoot: true,

test/index.test.js

@@ -24,7 +24,7 @@ import {
 	keyValueToBuffer,
 	levelup,
 	open,
-  version
+  version,
 	TIMESTAMP_PLACEHOLDER,
 	DIRECT_WRITE_PLACEHOLDER,
 } from '../node-index.js';