styles
fixed merge conflict