css
tweak padding
merge confilicts
responsive design