Hook profile header
Solve conflicts