Change header position
Conflict resolved