Fixed friends add css
fixed .action merge conflict css