correcting css after merge