header fix
fix up merge conflict for header