readded styles after commit conflict