fix conflict

src/assets/icons/visu/exploration/validMark.svg

src/components/Challenge/ChallengeCardOnGoing.tsx

src/components/Ecogesture/ecogestureCard.scss

src/components/Exploration/ExplorationError.spec.tsx

src/components/Exploration/ExplorationError.tsx

src/components/Exploration/ExplorationOngoing.spec.tsx

src/components/Exploration/ExplorationOngoing.tsx

src/components/Exploration/ExplorationView.tsx

.../Exploration/__snapshots__/ExplorationError.spec.tsx.snap

src/components/Exploration/explorationError.scss

src/components/Exploration/explorationOngoing.scss

src/components/Exploration/explorationView.scss

src/db/explorationEntity.json

src/locales/fr.json

src/services/exploration.service.ts

test/__mocks__/explorationData.mock.ts