Changed styling
fixed merge conflict