CDN added and Fix error
Conflict Fix