Merge branch 'master' of C:\ideaProjects\RestauRaw with conflicts.
Merge remote-tracking branch 'origin/master'
main has now a carrussel