New Styles
Fix conflicts