styling
fixed merge conflicts