Fix merge issues.

packages/imageviewer-extension/src/index.ts

@@ -99,7 +99,7 @@ function activate(app: JupyterLab, registry: IDocumentRegistry, palette: IComman
     tracker.add(widget);
   });
 
-  addCommands(tracker, commands);
+  addCommands(tracker, app.commands);
 
   let category = 'Image Viewer';
   [CommandIDs.zoomIn, CommandIDs.zoomOut, CommandIDs.resetZoom]

packages/terminal-extension/src/index.ts

@@ -92,7 +92,7 @@ function activate(app: JupyterLab, services: IServiceManager, mainMenu: IMainMen
     return;
   }
 
-  const { commands, shell } = app;
+  const { commands } = app;
   const category = 'Terminal';
   const namespace = 'terminal';
   const tracker = new InstanceTracker<Terminal>({ namespace });