demo files deleted
asset-url added
url with relative path
cname added
conflict resolved