Re-built using Roxygen following conflict resolutions.  Still some check warnings and note.  Maybe I made a mistake resolving the conflicts?