fix box-shadow
merge