New styling changes
Fixing merge conflicts