Cleanup styles
Fix merge conflict