deleted wrong css in merge