box shadows fixed
merge solved