Fixing conflicts from branch merge with ropensci/neotoma doc_fix