Fix merge error

jupyterlab/commands.py

@@ -133,20 +133,18 @@ def install_extension(extension, app_dir=None, logger=None):
     shutil.move(pjoin(target, fname), pjoin(app_dir, 'extensions'))
     shutil.rmtree(target)
 
-<<<<<<< HEAD
     # Remove any existing package from staging/node_modules
     target = pjoin(app_dir, 'staging', 'node_modules', data['name'])
     target = target.replace('/', os.sep)
     if os.path.exists(target):
         shutil.rmtree(target)
-=======
+
     # Handle any schemas.
     schema_data = data['jupyterlab'].get('schema_data', dict())
     for (key, value) in schema_data.items():
         path = pjoin(app_dir, 'schemas', key + '.json')
         with open(path, 'w') as fid:
             fid.write(value)
->>>>>>> 98eaf4ce4... Handle schema data for installed extensions
 
 
 def link_package(path, app_dir=None, logger=None):