header styling
merge conflicts