more styling
fixes conflicts