Fixing in-line styling
Fix merge conflict