Header conflict fix