header styling
fix merge conflict