Modify style
Fix conflicts