modified sample1
modified CDN path
resolved conflict