no staging required -- fixing broken links
Fixing merge conflict #963
Merge pull request #964 from pennij/working

fixed merge conflict #963