add new resource links
fixed merge conflict