fix: solve conflicts

Merge branch 'test_user' of https://outils-patrinat.mnhn.fr/gitlab/vigie-nature/standardisation/fonctions_en_kit into test_user

# Conflicts:
#	sample_pipeline.R