Fix bottom padding for #column-1:first-child
Fix merge conflict