new edits to NPMergeTest
Resolved the conflictions
Revert "Added a line to NPMergeTest"

This reverts commit c4157322b8ba5cad7f7a371e6124c5aff0223dee.
Merging changes