new edits to NPMergeTest