Merging ENRS and proposed changs