style updates
resolving merge conflict in css