Git merge conflict fix.
Old header've been removed