Update css on trip
Merg Conflict solved