fix merge conflict

src/app/app.component.ts

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

src/app/interfaces.ts

src/app/main-network.ts

src/app/network-settings.ts

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

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

src/index.html