Is there any recommendation or best practice for merging when there is a conflict in NAMESPACE, DESCRIPTION, ...

For DESCRIPTION I just manually resolved the merge conflict. For NAMESPACE I resolved all other conflicts, deleted NAMESPACE and ran devtools::document(). This worked in my case and the diff to the branch I was merging from looked good after the merge. Does this work in most cases and what could go wrong?

Similar with renv, if there's a merge-conflict in the renv lockfile, should I rather resolve this with renv in the unmerged HEAD or manually merge it or something else?