Fixed the resource links
merging with upstream
resolved conflicts