box shadow removed
Resolve conflict