content styling
merge conflicts