styling
fixed merge conflict