removed merge conflict lines from man and dot r file for get_download, resolves #15