Merge conflicts.

src/tray.ts

@@ -1,21 +1,12 @@
-import { Tray, Menu, BrowserWindow, app } from 'electron';
+import { Tray, Menu, app } from 'electron';
 import path from 'path';
 import { exec } from 'child_process';
 import log from 'electron-log/main';
-import { PythonEnvironment } from './pythonEnvironment';
 
 import { VirtualEnvironment } from './virtualEnvironment';
-
-export function SetupTray(
-  mainView: BrowserWindow,
-  reinstall: () => void,
-  virtualEnvironment: VirtualEnvironment
-): Tray {
-
 import { AppWindow } from './main-process/appWindow';
 
-export function SetupTray(mainView: AppWindow, reinstall: () => void, pythonEnvironment: PythonEnvironment): Tray {
-
+export function SetupTray(mainView: AppWindow, reinstall: () => void, virtualEnvironment: VirtualEnvironment): Tray {
   // Set icon for the tray
   // I think there is a way to packaged the icon in so you don't need to reference resourcesPath
   const trayImage = path.join(