fix merge conflicts with main

...app/components/analysis-panel/analysis-panel.component.ts

src/app/components/info-tile/info-tile.component.html

src/app/components/info-tile/info-tile.component.ts

...dd-expressed-proteins/add-expressed-proteins.component.ts

src/app/dialogs/custom-proteins/custom-proteins.component.ts

src/app/dialogs/launch-analysis/launch-analysis.component.ts

src/app/pages/explorer-page/explorer-page.component.html

src/app/pages/explorer-page/explorer-page.component.ts

src/app/services/analysis/analysis.service.ts

src/index.html