Corrected failed merge in the header.