Fixed merge headers