Fixing up styles from merges