fixed css merge errors as well