html/styling
merge