Resolving conflicts due to the data base file

CHERCHEM Sarahrequested to merge
origin/origin/main into main

add the possibility to select skills and interests in volunteer form then add the volunteer to the data base

Merge request reports