Add a link to the reader
Fix merge conflict