media queries
merge conflicts