more styling
fixed merge
fixed merge