merged new css