User styling
Resolved conflicts