staged merge conflict file

.gitlab-ci.yml

README.md

package-lock.json

package.json

pubpub/index.html

pubpub/mapscript.js

src/App/App.css

src/App/App.scss

src/App/App.tsx

src/Ideas.sx

src/components/AOSs.tsx

src/components/Filter.tsx

src/components/Footer.tsx

src/components/Header.tsx

src/components/Map1.tsx

src/components/My-Timeline.tsx

src/components/data/callablemapscr.js

src/components/data/legend.html

src/components/data/map.svg

src/components/data/mapscr.ts