resolved merge conflicts in GeoStacApp.jsx

src/components/container/App.jsx

src/components/container/GeoStacApp.jsx

src/components/presentational/ConsoleTargetInfo.jsx

src/components/presentational/FootprintResults.jsx

src/components/presentational/SearchAndFilterInput.jsx

src/components/presentational/Sidebar.jsx

src/components/presentational/SplashScreen.jsx

src/js/AstroDrawFilterControl.js

src/styles.css