changes Header avoiding merge conflict