fixed css reference
Fix merge conflicts