Fix bad merge for headers