Fixed merged headers