update to reflect new hp merge files.