fixed cdn links
fixed merges