adding new header
fixing a merge error, back to master