fixed css merge conflict
fixed merge conflict