fix merge
fix merge 2
set url for cs demo