Repair merge issues in NPPchanges.txt

Merge conflict