our header file disappeared from merge O_O