final merge of NEVPT2-NPDM code