styles
fixed merge conflicts