Fix up styles
Fix conflict