more styling
Fixed merge conflicts