wiped css slate clean
fixed css merge conflict