diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8ca8bce00..6766ccf23 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,7 +64,7 @@ jobs:
         run: |
           jlpm
           jlpm run eslint:check
-          python -m pip install -e .[dev,tests]
+          python -m pip install -e .[tests]
 
           # Python formatting checks
           black . --check
@@ -82,8 +82,6 @@ jobs:
 
           jupyter labextension list 2>&1 | grep -ie "@jupyterlab/git.*OK"
           python -m jupyterlab.browser_check
-          # Run our extension-specific browser integration test
-          # python tests/test-browser/run_browser_test.py
 
       - uses: actions/upload-artifact@v2
         if: matrix.python-version == '3.9'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4a786f412..bae9acb8e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,13 +22,13 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install jupyter_packaging~=0.7.9 jupyterlab~=3.0 packaging setuptools twine wheel
+        pip install jupyter_packaging~=0.7.9 jupyterlab~=3.0 packaging setuptools twine build
     - name: Publish the Python package
       env:
         TWINE_USERNAME: __token__
         TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
         twine upload dist/*
     - name: Publish the NPM package
       run: |
diff --git a/jupyterlab_git/git.py b/jupyterlab_git/git.py
index 013b6a60b..0f30005c8 100644
--- a/jupyterlab_git/git.py
+++ b/jupyterlab_git/git.py
@@ -14,8 +14,8 @@
 import pexpect
 import tornado
 import tornado.locks
-from nbdime import diff_notebooks, merge_notebooks
 from jupyter_server.utils import ensure_async
+from nbdime import diff_notebooks, merge_notebooks
 
 from .log import get_logger
 
@@ -1219,11 +1219,41 @@ async def _get_tag(self, path, commit_sha):
                 )
             )
 
-    async def show(self, filename, ref, path):
+    async def _get_base_ref(self, path, filename):
+        """Get the object reference for an unmerged ``filename`` at base stage.
+
+        Execute git ls-files -u -z <filename>
+
+        Returns:
+            The object reference or None
+        """
+        command = ["git", "ls-files", "-u", "-z", filename]
+
+        code, output, error = await execute(command, cwd=path)
+        if code != 0:
+            raise subprocess.CalledProcessError(
+                code, " ".join(command), output=output, stderr=error
+            )
+
+        split_line = strip_and_split(output)[0].split()
+
+        return split_line[1] if len(split_line) > 1 else None
+
+    async def show(self, path, ref, filename=None):
         """
-        Execute git show <ref:filename> command & return the result.
+        Execute
+            git show <ref:filename>
+          Or
+            git show <ref>
+
+        Return the file content
         """
-        command = ["git", "show", "{}:{}".format(ref, filename)]
+        command = ["git", "show"]
+
+        if filename is None:
+            command.append(ref)
+        else:
+            command.append(f"{ref}:{filename}")
 
         code, output, error = await execute(command, cwd=path)
 
@@ -1286,7 +1316,11 @@ async def get_content_at_reference(
                         log_message="Error occurred while executing command to retrieve plaintext content as file is not UTF-8."
                     )
 
-                content = await self.show(filename, "", path)
+                content = await self.show(path, "", filename)
+            elif reference["special"] == "BASE":
+                # Special case of file in merge conflict for which we want the base (aka common ancestor) version
+                ref = await self._get_base_ref(path, filename)
+                content = await self.show(path, ref)
             else:
                 raise tornado.web.HTTPError(
                     log_message="Error while retrieving plaintext content, unknown special ref '{}'.".format(
@@ -1300,7 +1334,7 @@ async def get_content_at_reference(
                     log_message="Error occurred while executing command to retrieve plaintext content as file is not UTF-8."
                 )
 
-            content = await self.show(filename, reference["git"], path)
+            content = await self.show(path, reference["git"], filename)
         else:
             content = ""
 
diff --git a/jupyterlab_git/tests/test_handlers.py b/jupyterlab_git/tests/test_handlers.py
index ad90f4164..30f5e152d 100644
--- a/jupyterlab_git/tests/test_handlers.py
+++ b/jupyterlab_git/tests/test_handlers.py
@@ -723,6 +723,50 @@ async def test_content_index(mock_execute, jp_fetch, jp_root_dir):
     )
 
 
+@patch("jupyterlab_git.git.execute")
+async def test_content_base(mock_execute, jp_fetch, jp_root_dir):
+    # Given
+    local_path = jp_root_dir / "test_path"
+    filename = "my/file"
+    content = "dummy content file\nwith multiple lines"
+    obj_ref = "915bb14609daab65e5304e59d89c626283ae49fc"
+
+    mock_execute.side_effect = [
+        maybe_future(
+            (
+                0,
+                "100644 {1} 1       {0}\x00100644 285bdbc14e499b85ec407512a3bb3992fa3d4082 2 {0}\x00100644 66ac842dfb0b5c20f757111d6b3edd56d80622b4 3 {0}\x00".format(
+                    filename, obj_ref
+                ),
+                "",
+            )
+        ),
+        maybe_future((0, content, "")),
+    ]
+
+    # When
+    body = {
+        "filename": filename,
+        "reference": {"special": "BASE"},
+    }
+    response = await jp_fetch(
+        NAMESPACE, local_path.name, "content", body=json.dumps(body), method="POST"
+    )
+
+    # Then
+    assert response.code == 200
+    payload = json.loads(response.body)
+    assert payload["content"] == content
+    mock_execute.assert_has_calls(
+        [
+            call(
+                ["git", "show", obj_ref],
+                cwd=str(local_path),
+            ),
+        ],
+    )
+
+
 @patch("jupyterlab_git.git.execute")
 async def test_content_unknown_special(mock_execute, jp_fetch, jp_root_dir):
     # Given
diff --git a/package.json b/package.json
index 383e33832..842d7d25a 100644
--- a/package.json
+++ b/package.json
@@ -8,9 +8,11 @@
   "license": "BSD-3-Clause",
   "author": "Jupyter Development Team",
   "keywords": [
-    "jupyter",
-    "jupyterlab",
-    "jupyterlab-extension"
+    "Jupyter",
+    "JupyterLab",
+    "JupyterLab3",
+    "jupyterlab-extension",
+    "Git"
   ],
   "scripts": {
     "build": "jlpm run build:lib && jlpm run build:labextension:dev",
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 000000000..7b50b3b2c
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,47 @@
+[metadata]
+long_description = file: README.md
+long_description_content_type = text/markdown
+platforms = Linux, Mac OS X, Windows
+classifiers =
+  Intended Audience :: Developers
+  Intended Audience :: Science/Research
+  License :: OSI Approved :: BSD License
+  Programming Language :: Python
+  Programming Language :: Python :: 3
+  Programming Language :: Python :: 3.6
+  Programming Language :: Python :: 3.7
+  Programming Language :: Python :: 3.8
+  Programming Language :: Python :: 3.9
+  Framework :: Jupyter
+  Framework :: Jupyter :: JupyterLab
+  Framework :: Jupyter :: JupyterLab :: 3
+  Framework :: Jupyter :: JupyterLab :: Extensions
+  Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt
+
+[options]
+packages = find:
+install_requires =
+  jupyter_server
+  nbdime~=3.1
+  nbformat
+  packaging
+  pexpect
+include_package_data = True
+zip_safe = False
+python_requires = >=3.6,<4
+
+[options.extras_require]
+dev=
+  black
+  coverage
+  jupyter_packaging~=0.7.9
+  jupyterlab~=3.0
+  pre-commit
+  pytest
+  pytest-asyncio
+  pytest-cov
+  pytest-tornasync
+tests=
+  %(dev)s
+  hybridcontents
+
diff --git a/setup.py b/setup.py
index bc381a82e..16e322de4 100644
--- a/setup.py
+++ b/setup.py
@@ -19,9 +19,10 @@
 # The name of the project
 name = "jupyterlab_git"
 
-# Get our version
 with (HERE / "package.json").open() as f:
-    version = str(parse(json.load(f)["version"]))
+    npm_data = json.load(f)
+# Get the version
+version = str(parse(npm_data["version"]))
 
 lab_path = HERE / name / "labextension"
 
@@ -64,61 +65,15 @@
 else:
     cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command)
 
-long_description = (HERE / "README.md").read_text(errors="ignore")
-
 setup_args = dict(
     name=name,
     version=version,
-    url="https://github.com/jupyterlab/jupyterlab-git.git",
-    author="Jupyter Development Team",
-    description="A JupyterLab extension for version control using git",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
+    url=npm_data["homepage"],
+    author=npm_data["author"],
+    description=npm_data["description"],
     cmdclass=cmdclass,
-    packages=setuptools.find_packages(),
-    install_requires=[
-        "jupyter_server",
-        "nbdime~=3.1",
-        "nbformat",
-        "packaging",
-        "pexpect",
-    ],
-    zip_safe=False,
-    include_package_data=True,
-    python_requires=">=3.6,<4",
-    license="BSD-3-Clause",
-    platforms="Linux, Mac OS X, Windows",
-    keywords=["Jupyter", "JupyterLab", "JupyterLab3", "Git"],
-    classifiers=[
-        "Intended Audience :: Developers",
-        "Intended Audience :: Science/Research",
-        "License :: OSI Approved :: BSD License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Framework :: Jupyter",
-        "Framework :: Jupyter :: JupyterLab",
-        "Framework :: Jupyter :: JupyterLab :: 3",
-        "Framework :: Jupyter :: JupyterLab :: Extensions",
-        "Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt",
-    ],
-    extras_require={
-        "dev": [
-            "black",
-            "coverage",
-            "jupyter_packaging~=0.7.9",
-            "jupyterlab~=3.0",
-            "pre-commit",
-            "pytest",
-            "pytest-asyncio",
-            "pytest-cov",
-            "pytest-tornasync",
-        ],
-        "tests": ["hybridcontents"],
-    },
+    license=npm_data["license"],
+    keywords=npm_data["keywords"],
 )
 
 
diff --git a/src/commandsAndMenu.tsx b/src/commandsAndMenu.tsx
index 94fe19001..42d13bbea 100644
--- a/src/commandsAndMenu.tsx
+++ b/src/commandsAndMenu.tsx
@@ -13,7 +13,7 @@ import { FileBrowser, FileBrowserModel } from '@jupyterlab/filebrowser';
 import { Contents, ContentsManager } from '@jupyterlab/services';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITerminal } from '@jupyterlab/terminal';
-import { TranslationBundle } from '@jupyterlab/translation';
+import { ITranslator, TranslationBundle } from '@jupyterlab/translation';
 import { closeIcon, ContextMenuSvg } from '@jupyterlab/ui-components';
 import { ArrayExt, toArray } from '@lumino/algorithm';
 import { CommandRegistry } from '@lumino/commands';
@@ -105,9 +105,10 @@ export function addCommands(
   gitModel: GitExtension,
   fileBrowserModel: FileBrowserModel,
   settings: ISettingRegistry.ISettings,
-  trans: TranslationBundle
+  translator: ITranslator
 ): void {
   const { commands, shell, serviceManager } = app;
+  const trans = translator.load('jupyterlab_git');
 
   /**
    * Commit using a keystroke combination when in CommitBox.
@@ -212,7 +213,7 @@ export function addCommands(
           logger.log({
             message: trans.__('Failed to initialize the Git repository'),
             level: Level.ERROR,
-            error
+            error: error as Error
           });
         }
       }
@@ -329,7 +330,7 @@ export function addCommands(
           logger.log({
             message: trans.__('Failed to clone'),
             level: Level.ERROR,
-            error
+            error: error as Error
           });
         }
       }
@@ -378,7 +379,7 @@ export function addCommands(
         logger.log({
           message: trans.__('Failed to push'),
           level: Level.ERROR,
-          error
+          error: error as Error
         });
       }
     }
@@ -413,7 +414,7 @@ export function addCommands(
         logger.log({
           message: trans.__('Failed to pull'),
           level: Level.ERROR,
-          error
+          error: error as Error
         });
       }
     }
@@ -436,11 +437,16 @@ export function addCommands(
         isText?: boolean;
       };
 
+      const fullPath = PathExt.join(
+        model.repositoryPath ?? '/',
+        model.filename
+      );
+
       const buildDiffWidget =
-        getDiffProvider(model.filename) ?? (isText && createPlainTextDiff);
+        getDiffProvider(fullPath) ?? (isText && createPlainTextDiff);
 
       if (buildDiffWidget) {
-        const id = `diff-${model.filename}-${model.reference.label}-${model.challenger.label}`;
+        const id = `diff-${fullPath}-${model.reference.label}-${model.challenger.label}`;
         const mainAreaItems = shell.widgets('main');
         let mainAreaItem = mainAreaItems.next();
         while (mainAreaItem) {
@@ -460,7 +466,7 @@ export function addCommands(
           }));
           diffWidget.id = id;
           diffWidget.title.label = PathExt.basename(model.filename);
-          diffWidget.title.caption = model.filename;
+          diffWidget.title.caption = fullPath;
           diffWidget.title.icon = diffIcon;
           diffWidget.title.closable = true;
           diffWidget.addClass('jp-git-diff-parent-widget');
@@ -470,7 +476,11 @@ export function addCommands(
 
           // Create the diff widget
           try {
-            const widget = await buildDiffWidget(model, diffWidget.toolbar);
+            const widget = await buildDiffWidget(
+              model,
+              diffWidget.toolbar,
+              translator
+            );
 
             diffWidget.toolbar.addItem('spacer', Toolbar.createSpacerItem());
 
@@ -495,14 +505,14 @@ export function addCommands(
 
                   try {
                     await serviceManager.contents.save(
-                      model.filename,
+                      fullPath,
                       await widget.getResolvedFile()
                     );
                     await gitModel.add(model.filename);
                     await gitModel.refresh();
                   } catch (reason) {
                     logger.log({
-                      message: reason.message ?? reason,
+                      message: (reason as Error).message ?? (reason as string),
                       level: Level.ERROR
                     });
                   } finally {
@@ -541,7 +551,9 @@ export function addCommands(
             content.addWidget(widget);
           } catch (reason) {
             console.error(reason);
-            const msg = `Load Diff Model Error (${reason.message || reason})`;
+            const msg = `Load Diff Model Error (${
+              (reason as Error).message || reason
+            })`;
             modelIsLoading.reject(msg);
           }
         }
@@ -612,8 +624,9 @@ export function addCommands(
           continue;
         }
 
-        const repositoryPath = gitModel.getRelativeFilePath();
-        const filename = PathExt.join(repositoryPath, filePath);
+        const repositoryPath = gitModel.pathRepository;
+        const filename = filePath;
+        const fullPath = PathExt.join(repositoryPath, filename);
         const specialRef =
           status === 'staged'
             ? Git.Diff.SpecialRef.INDEX
@@ -622,9 +635,9 @@ export function addCommands(
         const diffContext: Git.Diff.IContext =
           status === 'unmerged'
             ? {
-                currentRef: 'HEAD',
-                previousRef: 'MERGE_HEAD',
-                baseRef: 'ORIG_HEAD'
+                currentRef: 'MERGE_HEAD',
+                previousRef: 'HEAD',
+                baseRef: Git.Diff.SpecialRef.BASE
               }
             : context ?? {
                 currentRef: specialRef,
@@ -643,7 +656,7 @@ export function addCommands(
                 URLExt.join(repositoryPath, 'content'),
                 'POST',
                 {
-                  filename: filePath,
+                  filename,
                   reference: challengerRef
                 }
               ).then(data => data.content);
@@ -661,7 +674,7 @@ export function addCommands(
                 URLExt.join(repositoryPath, 'content'),
                 'POST',
                 {
-                  filename: previousFilePath ?? filePath,
+                  filename: previousFilePath ?? filename,
                   reference: { git: diffContext.previousRef }
                 }
               ).then(data => data.content);
@@ -671,7 +684,8 @@ export function addCommands(
               diffContext.previousRef,
             source: diffContext.previousRef,
             updateAt: Date.now()
-          }
+          },
+          repositoryPath
         };
 
         // Case when file is relocated
@@ -697,8 +711,10 @@ export function addCommands(
                 URLExt.join(repositoryPath, 'content'),
                 'POST',
                 {
-                  filename: filePath,
-                  reference: { git: diffContext.baseRef }
+                  filename,
+                  reference: {
+                    special: Git.Diff.SpecialRef[diffContext.baseRef as any]
+                  }
                 }
               ).then(data => data.content);
             },
@@ -743,7 +759,7 @@ export function addCommands(
                 change.newValue.last_modified
               ).valueOf();
               if (
-                change.newValue.path === filename &&
+                change.newValue.path === fullPath &&
                 model.challenger.updateAt !== updateAt
               ) {
                 model.challenger = {
@@ -1314,7 +1330,7 @@ namespace Private {
     } catch (error) {
       if (
         AUTH_ERROR_MESSAGES.some(
-          errorMessage => error.message.indexOf(errorMessage) > -1
+          errorMessage => (error as Error).message.indexOf(errorMessage) > -1
         )
       ) {
         // If the error is an authentication error, ask the user credentials
diff --git a/src/components/FileItem.tsx b/src/components/FileItem.tsx
index cf52c58ad..4299d76b5 100644
--- a/src/components/FileItem.tsx
+++ b/src/components/FileItem.tsx
@@ -6,6 +6,7 @@ import {
   fileChangedLabelBrandStyle,
   fileChangedLabelInfoStyle,
   fileChangedLabelStyle,
+  fileChangedLabelWarnStyle,
   fileStyle,
   gitMarkBoxStyle,
   selectedFileChangedLabelStyle,
@@ -149,6 +150,14 @@ export class FileItem extends React.PureComponent<IFileItemProps> {
             selectedFileChangedLabelStyle
           )
         : classes(fileChangedLabelStyle, fileChangedLabelBrandStyle);
+    } else if (change === '!') {
+      return this.props.selected
+        ? classes(
+            fileChangedLabelStyle,
+            fileChangedLabelWarnStyle,
+            selectedFileChangedLabelStyle
+          )
+        : classes(fileChangedLabelStyle, fileChangedLabelWarnStyle);
     } else {
       return this.props.selected
         ? classes(
@@ -207,7 +216,11 @@ export class FileItem extends React.PureComponent<IFileItemProps> {
           filetype={this.props.file.type}
         />
         {this.props.actions}
-        <span className={this._getFileChangedLabelClass(this.props.file.y)}>
+        <span
+          className={this._getFileChangedLabelClass(
+            this.props.file.status === 'unmerged' ? '!' : this.props.file.y
+          )}
+        >
           {this.props.file.status === 'unmerged'
             ? '!'
             : this.props.file.y === '?'
diff --git a/src/components/FileList.tsx b/src/components/FileList.tsx
index f75bb8ce0..a05e898b1 100644
--- a/src/components/FileList.tsx
+++ b/src/components/FileList.tsx
@@ -9,7 +9,7 @@ import { ListChildComponentProps } from 'react-window';
 import { addMenuItems, CommandArguments } from '../commandsAndMenu';
 import { getDiffProvider, GitExtension } from '../model';
 import { hiddenButtonStyle } from '../style/ActionButtonStyle';
-import { fileListWrapperClass, unmergedRowStyle } from '../style/FileListStyle';
+import { fileListWrapperClass } from '../style/FileListStyle';
 import {
   addIcon,
   diffIcon,
@@ -266,10 +266,29 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
    */
   render(): JSX.Element {
     if (this.props.settings.composite['simpleStaging']) {
+      const unmergedFiles: Git.IStatusFile[] = [];
+      const otherFiles: Git.IStatusFile[] = [];
+
+      this.props.files.forEach(file => {
+        switch (file.status) {
+          case 'unmerged':
+            unmergedFiles.push(file);
+            break;
+          default:
+            otherFiles.push(file);
+            break;
+        }
+      });
+
       return (
         <div className={fileListWrapperClass}>
           <AutoSizer disableWidth={true}>
-            {({ height }) => this._renderSimpleStage(this.props.files, height)}
+            {({ height }) => (
+              <>
+                {this._renderUnmerged(unmergedFiles, height, false)}
+                {this._renderSimpleStage(otherFiles, height)}
+              </>
+            )}
           </AutoSizer>
         </div>
       );
@@ -303,8 +322,6 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
           case 'unmerged':
             unmergedFiles.push(file);
             break;
-          default:
-            break;
         }
       });
 
@@ -362,7 +379,6 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
     const diffButton = this._createDiffButton(file);
     return (
       <FileItem
-        className={unmergedRowStyle}
         trans={this.props.trans}
         actions={!file.is_binary && diffButton}
         contextMenu={this.openContextMenu}
@@ -376,11 +392,15 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
     );
   };
 
-  private _renderUnmerged(files: Git.IStatusFile[], height: number) {
+  private _renderUnmerged(
+    files: Git.IStatusFile[],
+    height: number,
+    collapsible = true
+  ) {
     // Hide section if no merge conflicts are present
     return files.length > 0 ? (
       <GitStage
-        collapsible
+        collapsible={collapsible}
         files={files}
         heading={this.props.trans.__('Conflicted')}
         height={height}
diff --git a/src/components/diff/NotebookDiff.ts b/src/components/diff/NotebookDiff.ts
index b0a4030bf..3b402d51d 100644
--- a/src/components/diff/NotebookDiff.ts
+++ b/src/components/diff/NotebookDiff.ts
@@ -25,6 +25,11 @@ import {
 } from 'nbdime/lib/diff/widget/common';
 import { requestAPI } from '../../git';
 import { Git } from '../../tokens';
+import {
+  ITranslator,
+  nullTranslator,
+  TranslationBundle
+} from '@jupyterlab/translation';
 
 /**
  * Class of the outermost widget, the draggable tab
@@ -77,10 +82,12 @@ interface INbdimeMergeDiff {
 export const createNotebookDiff = async (
   model: Git.Diff.IModel,
   renderMime: IRenderMimeRegistry,
-  toolbar?: Toolbar
+  toolbar?: Toolbar,
+  translator?: ITranslator
 ): Promise<NotebookDiff> => {
   // Create the notebook diff view
-  const diffWidget = new NotebookDiff(model, renderMime);
+  const trans = translator.load('jupyterlab_git');
+  const diffWidget = new NotebookDiff(model, renderMime, trans);
   diffWidget.addClass('jp-git-diff-root');
 
   await diffWidget.ready;
@@ -93,13 +100,14 @@ export const createNotebookDiff = async (
     checkbox.type = 'checkbox';
     checkbox.checked = true;
     label.appendChild(checkbox);
-    label.appendChild(document.createElement('span')).textContent =
-      'Hide unchanged cells';
+    label.appendChild(document.createElement('span')).textContent = trans.__(
+      'Hide unchanged cells'
+    );
     toolbar.addItem('hideUnchanged', new Widget({ node: label }));
 
     if (model.hasConflict) {
-      // FIXME: Merge view breaks when moving checkboxes to the toolbar
-      // toolbar.addItem('clear-outputs', diffWidget.nbdimeWidget.widgets[0])
+      // Move merge notebook controls in the toolbar
+      toolbar.addItem('clear-outputs', diffWidget.nbdimeWidget.widgets[0]);
     }
 
     // Connect toolbar checkbox and notebook diff widget
@@ -116,12 +124,17 @@ export const createNotebookDiff = async (
  * NotebookDiff widget
  */
 export class NotebookDiff extends Panel implements Git.Diff.IDiffWidget {
-  constructor(model: Git.Diff.IModel, renderMime: IRenderMimeRegistry) {
+  constructor(
+    model: Git.Diff.IModel,
+    renderMime: IRenderMimeRegistry,
+    translator?: TranslationBundle
+  ) {
     super();
     const getReady = new PromiseDelegate<void>();
     this._isReady = getReady.promise;
     this._model = model;
     this._renderMime = renderMime;
+    this._trans = translator ?? nullTranslator.load('jupyterlab_git');
 
     this.addClass(NBDIME_CLASS);
 
@@ -131,7 +144,7 @@ export class NotebookDiff extends Panel implements Git.Diff.IDiffWidget {
       })
       .catch(reason => {
         console.error(
-          'Failed to refresh Notebook diff.',
+          this._trans.__('Failed to refresh Notebook diff.'),
           reason,
           reason?.traceback
         );
@@ -221,7 +234,8 @@ export class NotebookDiff extends Panel implements Git.Diff.IDiffWidget {
       const header = Private.diffHeader(
         this._model.reference.label,
         this._model.challenger.label,
-        this._hasConflict
+        this._hasConflict,
+        this._trans.__('COMMON ANCESTOR')
       );
       this.addWidget(header);
 
@@ -259,11 +273,13 @@ export class NotebookDiff extends Panel implements Git.Diff.IDiffWidget {
         // FIXME there is a bug in nbdime and init got reject due to recursion limit hit
         // console.error(`Failed to init notebook diff view: ${reason}`);
         // getReady.reject(reason);
-        console.debug(`Failed to init notebook diff view: ${reason}`);
+        console.debug(
+          this._trans.__('Failed to init notebook diff view: %1', reason)
+        );
         Private.markUnchangedRanges(this._scroller.node, this._hasConflict);
       }
     } catch (reason) {
-      this.showError(reason);
+      this.showError(reason as Error);
     }
   }
 
@@ -317,7 +333,7 @@ export class NotebookDiff extends Panel implements Git.Diff.IDiffWidget {
    */
   protected showError(error: Error): void {
     console.error(
-      'Failed to load file diff.',
+      this._trans.__('Failed to load file diff.'),
       error,
       (error as any)?.traceback
     );
@@ -328,18 +344,19 @@ export class NotebookDiff extends Panel implements Git.Diff.IDiffWidget {
 
     const msg = ((error.message || error) as string).replace('\n', '<br />');
     this.node.innerHTML = `<p class="jp-git-diff-error">
-      <span>Error Loading Notebook Diff:</span>
+      <span>${this._trans.__('Error Loading Notebook Diff:')}</span>
       <span class="jp-git-diff-error-message">${msg}</span>
     </p>`;
   }
 
   protected _areUnchangedCellsHidden = false;
   protected _isReady: Promise<void>;
+  protected _lastSerializeModel: INotebookContent | null = null;
   protected _model: Git.Diff.IModel;
+  protected _nbdWidget: NotebookMergeWidget | NotebookDiffWidget;
   protected _renderMime: IRenderMimeRegistry;
   protected _scroller: Panel;
-  protected _nbdWidget: NotebookMergeWidget | NotebookDiffWidget;
-  protected _lastSerializeModel: INotebookContent | null = null;
+  protected _trans: TranslationBundle;
 }
 
 namespace Private {
@@ -347,19 +364,23 @@ namespace Private {
    * Create a header widget for the diff view.
    */
   export function diffHeader(
-    baseLabel: string,
+    localLabel: string,
     remoteLabel: string,
-    hasConflict: boolean
+    hasConflict: boolean,
+    baseLabel?: string
   ): Widget {
+    const bannerClass = hasConflict
+      ? 'jp-git-merge-banner'
+      : 'jp-git-diff-banner';
     const node = document.createElement('div');
     node.className = 'jp-git-diff-header';
-    node.innerHTML = `<div class="jp-git-diff-banner">
-        <span>${baseLabel}</span>
+    node.innerHTML = `<div class="${bannerClass}">
+        <span>${localLabel}</span>
         <span class="jp-spacer"></span>
         ${
           hasConflict
             ? // Add extra space during notebook merge view
-              '<span>&nbsp;</span><span class="jp-spacer"></span>'
+              `<span>${baseLabel}</span><span class="jp-spacer"></span>`
             : ''
         }
         <span>${remoteLabel}</span>
diff --git a/src/components/diff/PlainTextDiff.ts b/src/components/diff/PlainTextDiff.ts
index 50d9eb927..18d67b29c 100644
--- a/src/components/diff/PlainTextDiff.ts
+++ b/src/components/diff/PlainTextDiff.ts
@@ -1,6 +1,11 @@
 import { Toolbar } from '@jupyterlab/apputils';
 import { Mode } from '@jupyterlab/codemirror';
 import { Contents } from '@jupyterlab/services';
+import {
+  ITranslator,
+  nullTranslator,
+  TranslationBundle
+} from '@jupyterlab/translation';
 import { PromiseDelegate } from '@lumino/coreutils';
 import { Widget } from '@lumino/widgets';
 import { MergeView } from 'codemirror';
@@ -16,9 +21,10 @@ import { MergeView as LocalMergeView, mergeView } from './mergeview';
  */
 export const createPlainTextDiff: Git.Diff.ICallback = async (
   model: Git.Diff.IModel,
-  toolbar?: Toolbar
+  toolbar?: Toolbar,
+  translator?: ITranslator
 ): Promise<PlainTextDiff> => {
-  const widget = new PlainTextDiff(model);
+  const widget = new PlainTextDiff(model, translator.load('jupyterlab_git'));
   await widget.ready;
   return widget;
 };
@@ -27,7 +33,7 @@ export const createPlainTextDiff: Git.Diff.ICallback = async (
  * Plain Text Diff widget
  */
 export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
-  constructor(model: Git.Diff.IModel) {
+  constructor(model: Git.Diff.IModel, translator?: TranslationBundle) {
     super({
       node: PlainTextDiff.createNode(
         model.reference.label,
@@ -39,6 +45,7 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
     this._isReady = getReady.promise;
     this._container = this.node.lastElementChild as HTMLElement;
     this._model = model;
+    this._trans = translator ?? nullTranslator.load('jupyterlab_git');
 
     // Load file content early
     Promise.all([
@@ -93,7 +100,9 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
         content: value
       });
     } else {
-      return Promise.reject('Failed to get a valid file value.');
+      return Promise.reject(
+        this._trans.__('Failed to get a valid file value.')
+      );
     }
   }
 
@@ -157,7 +166,7 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
       this._reference = null;
       this._base = null;
     } catch (reason) {
-      this.showError(reason);
+      this.showError(reason as Error);
     }
   }
 
@@ -165,10 +174,12 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
    * Create wrapper node
    */
   protected static createNode(...labels: string[]): HTMLElement {
+    const bannerClass =
+      labels[1] !== undefined ? 'jp-git-merge-banner' : 'jp-git-diff-banner';
     const head = document.createElement('div');
     head.className = 'jp-git-diff-root';
     head.innerHTML = `
-    <div class="jp-git-diff-banner">
+    <div class="${bannerClass}">
       ${labels
         .filter(label => !!label)
         .map(label => `<span>${label}</span>`)
@@ -206,9 +217,9 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
       if (baseContent !== null && baseContent !== undefined) {
         options = {
           ...options,
+          origLeft: referenceContent,
           value: baseContent,
-          origRight: referenceContent,
-          origLeft: challengerContent,
+          origRight: challengerContent,
           readOnly: false,
           revertButtons: true
         };
@@ -230,13 +241,13 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
    */
   protected showError(error: Error): void {
     console.error(
-      'Failed to load file diff.',
+      this._trans.__('Failed to load file diff.'),
       error,
       (error as any)?.traceback
     );
     const msg = ((error.message || error) as string).replace('\n', '<br />');
     this.node.innerHTML = `<p class="jp-git-diff-error">
-      <span>Error Loading File Diff:</span>
+      <span>${this._trans.__('Error Loading File Diff:')}</span>
       <span class="jp-git-diff-error-message">${msg}</span>
     </p>`;
   }
@@ -257,6 +268,7 @@ export class PlainTextDiff extends Widget implements Git.Diff.IDiffWidget {
   protected _isReady: Promise<void>;
   protected _mergeView: MergeView.MergeViewEditor;
   protected _model: Git.Diff.IModel;
+  protected _trans: TranslationBundle;
 
   private _reference: string | null = null;
   private _challenger: string | null = null;
diff --git a/src/components/diff/model.ts b/src/components/diff/model.ts
index b1015d3b4..227c9b63c 100644
--- a/src/components/diff/model.ts
+++ b/src/components/diff/model.ts
@@ -10,6 +10,7 @@ export class DiffModel implements IDisposable, Git.Diff.IModel {
     this._challenger = props.challenger;
     this._filename = props.filename;
     this._reference = props.reference;
+    this._repositoryPath = props.repositoryPath;
     this._base = props.base;
 
     this._changed = new Signal<DiffModel, Git.Diff.IModelChange>(this);
@@ -55,6 +56,8 @@ export class DiffModel implements IDisposable, Git.Diff.IModel {
 
   /**
    * File to be compared
+   *
+   * Note: This path is relative to the repository path
    */
   get filename(): string {
     return this._filename;
@@ -75,6 +78,15 @@ export class DiffModel implements IDisposable, Git.Diff.IModel {
     }
   }
 
+  /**
+   * Git repository path
+   *
+   * Note: This path is relative to the server root
+   */
+  get repositoryPath(): string | undefined {
+    return this._repositoryPath;
+  }
+
   /**
    * Base description
    *
@@ -117,4 +129,5 @@ export class DiffModel implements IDisposable, Git.Diff.IModel {
   private _changed: Signal<DiffModel, Git.Diff.IModelChange>;
   private _isDisposed = false;
   private _filename: string;
+  private _repositoryPath: string;
 }
diff --git a/src/index.ts b/src/index.ts
index 68895f600..d58142f24 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -86,7 +86,9 @@ async function activate(
   try {
     settings = await settingRegistry.load(plugin.id);
   } catch (error) {
-    console.error(`Failed to load settings for the Git Extension.\n${error}`);
+    console.error(
+      trans.__('Failed to load settings for the Git Extension.\n%1', error)
+    );
   }
   try {
     serverSettings = await getServerSettings(trans);
@@ -123,7 +125,7 @@ async function activate(
   } catch (error) {
     // If we fall here, nothing will be loaded in the frontend.
     console.error(
-      'Failed to load the jupyterlab-git server extension settings',
+      trans.__('Failed to load the jupyterlab-git server extension settings'),
       error
     );
     showErrorMessage(
@@ -166,7 +168,7 @@ async function activate(
   // Provided we were able to load application settings, create the extension widgets
   if (settings) {
     // Add JupyterLab commands
-    addCommands(app, gitExtension, fileBrowser.model, settings, trans);
+    addCommands(app, gitExtension, fileBrowser.model, settings, translator);
 
     // Create the Git widget sidebar
     const gitPlugin = new GitWidget(
@@ -209,8 +211,8 @@ async function activate(
   gitExtension.registerDiffProvider(
     'Nbdime',
     ['.ipynb'],
-    (model: Git.Diff.IModel, toolbar?: Toolbar) =>
-      createNotebookDiff(model, renderMime, toolbar)
+    (model: Git.Diff.IModel, toolbar?: Toolbar, translator?: ITranslator) =>
+      createNotebookDiff(model, renderMime, toolbar, translator)
   );
 
   return gitExtension;
diff --git a/src/style/FileItemStyle.ts b/src/style/FileItemStyle.ts
index 4317fb2b2..d6f9c83d9 100644
--- a/src/style/FileItemStyle.ts
+++ b/src/style/FileItemStyle.ts
@@ -58,6 +58,11 @@ export const fileChangedLabelBrandStyle = style({
   color: 'var(--jp-brand-color0)'
 });
 
+export const fileChangedLabelWarnStyle = style({
+  color: 'var(--jp-warn-color0)',
+  fontWeight: 'bold'
+});
+
 export const fileChangedLabelInfoStyle = style({
   color: 'var(--jp-info-color0)'
 });
diff --git a/src/style/FileListStyle.ts b/src/style/FileListStyle.ts
index d69e4f268..2499de811 100644
--- a/src/style/FileListStyle.ts
+++ b/src/style/FileListStyle.ts
@@ -7,7 +7,3 @@ export const fileListWrapperClass = style({
   overflow: 'hidden',
   overflowY: 'auto'
 });
-
-export const unmergedRowStyle = style({
-  color: 'var(--jp-warn-color0) !important'
-});
diff --git a/src/tokens.ts b/src/tokens.ts
index b7b3e78c0..8649a5a96 100644
--- a/src/tokens.ts
+++ b/src/tokens.ts
@@ -2,6 +2,7 @@ import { Toolbar } from '@jupyterlab/apputils';
 import { IChangedArgs } from '@jupyterlab/coreutils';
 import { DocumentRegistry } from '@jupyterlab/docregistry';
 import { Contents, ServerConnection } from '@jupyterlab/services';
+import { ITranslator } from '@jupyterlab/translation';
 import { JSONObject, ReadonlyJSONObject, Token } from '@lumino/coreutils';
 import { IDisposable } from '@lumino/disposable';
 import { ISignal } from '@lumino/signaling';
@@ -495,7 +496,8 @@ export namespace Git {
      */
     export type ICallback = (
       model: IModel,
-      toolbar?: Toolbar
+      toolbar?: Toolbar,
+      trans?: ITranslator
     ) => Promise<IDiffWidget>;
 
     /**
@@ -539,10 +541,10 @@ export namespace Git {
      * To differentiate with the regular Git ref they are passed as number
      */
     export interface IContext {
-      currentRef: string | SpecialRef;
+      currentRef: string | SpecialRef.WORKING | SpecialRef.INDEX;
       previousRef: string | SpecialRef;
       // Used only during merge conflict diffs
-      baseRef?: string;
+      baseRef?: string | SpecialRef.BASE;
     }
 
     /**
@@ -559,6 +561,8 @@ export namespace Git {
       readonly changed: ISignal<IModel, IModelChange>;
       /**
        * File of the name being diff at reference state
+       *
+       * Note: This is the relative path
        */
       readonly filename: string;
       /**
@@ -573,6 +577,12 @@ export namespace Git {
        * Helper to check if the file has conflicts.
        */
       hasConflict?: boolean;
+      /**
+       * Git repository path
+       *
+       * Note: This is relative to the server root
+       */
+      readonly repositoryPath?: string;
     }
 
     /**
@@ -586,8 +596,12 @@ export namespace Git {
     }
 
     export enum SpecialRef {
+      // Working version
       'WORKING',
-      'INDEX'
+      // Index version
+      'INDEX',
+      // Common ancestor version (useful for unmerged files)
+      'BASE'
     }
   }
 
diff --git a/style/diff-common.css b/style/diff-common.css
index fcbe150c1..5d4d790bc 100644
--- a/style/diff-common.css
+++ b/style/diff-common.css
@@ -38,13 +38,13 @@ button.jp-git-diff-resolve .jp-ToolbarButtonComponent-label {
   color: var(--jp-success-color1);
 }
 
-.jp-git-diff-banner {
+.jp-git-diff-banner, .jp-git-merge-banner {
   flex: 0 0 auto;
-  margin-bottom: 5px;
+  margin: 2px 0px;
   display: flex;
 }
 
-.jp-git-diff-banner span {
+.jp-git-diff-banner span{
   padding: 0px 4px;
   width: 47%;
   font-weight: bold;
@@ -62,6 +62,16 @@ button.jp-git-diff-resolve .jp-ToolbarButtonComponent-label {
   background-color: var(--jp-git-diff-added-color);
 }
 
+.jp-git-merge-banner span {
+  padding: 0px 4px;
+  width: 31%;
+  font-weight: bold;
+}
+
+.jp-git-merge-banner span.jp-spacer {
+  width: 3.5%;
+}
+
 .jp-git-diff-root .CodeMirror-merge {
   position: relative;
   white-space: pre;
@@ -111,7 +121,6 @@ button.jp-git-diff-resolve .jp-ToolbarButtonComponent-label {
   display: inline-block;
   white-space: normal;
   vertical-align: top;
-  width: 100%;
 }
 
 .jp-git-diff-root .CodeMirror-merge-pane-rightmost {
diff --git a/style/diff-nb.css b/style/diff-nb.css
index 4f14fd54a..89360f299 100644
--- a/style/diff-nb.css
+++ b/style/diff-nb.css
@@ -11,21 +11,31 @@
   border: var(--codemirror-border);
 }
 
-.jp-git-diff-root .jp-Notebook-diff .jp-Metadata-diff {
+.jp-git-diff-root .jp-Notebook-diff .jp-Metadata-diff,
+.jp-git-diff-root .jp-Notebook-merge .jp-Metadata-diff {
   border: none;
 }
 
 .jp-git-diff-root .jp-Notebook-diff .CodeMirror-merge-r-chunk-end,
-.jp-git-diff-root .jp-Notebook-diff .CodeMirror-merge-l-chunk-end {
+.jp-git-diff-root .jp-Notebook-diff .CodeMirror-merge-l-chunk-end,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-l-chunk-end,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-r-chunk-end,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-local,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-m-chunk-end-remote {
   border-bottom: none;
 }
 
 .jp-git-diff-root .jp-Notebook-diff .CodeMirror-merge-r-chunk-start,
-.jp-git-diff-root .jp-Notebook-diff .CodeMirror-merge-l-chunk-start {
+.jp-git-diff-root .jp-Notebook-diff .CodeMirror-merge-l-chunk-start,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-l-chunk-start,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-r-chunk-start,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-m-chunk-start-local,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-m-chunk-start-remote {
   border-top: none;
 }
 
-.jp-git-diff-root .jp-Notebook-diff .CodeMirror-merge-r-chunk {
+.jp-git-diff-root .jp-Notebook-diff .CodeMirror-merge-r-chunk,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-r-chunk {
   background-color: var(--jp-git-diff-deleted-color);
 }
 
@@ -36,13 +46,15 @@
   background-color: var(--jp-git-diff-added-color);
 }
 
-.jp-git-diff-root .jp-Notebook-diff .CodeMirror-merge-spacer {
-  background-color: transparent;
-}
-
+.jp-git-diff-root .jp-Notebook-diff .CodeMirror-merge-spacer,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-spacer,
 .jp-git-diff-root
   .jp-Notebook-diff
   .CodeMirror-merge-pane-remote
+  .CodeMirror-merge-spacer,
+.jp-git-diff-root
+  .jp-Notebook-merge
+  .CodeMirror-merge-pane-remote
   .CodeMirror-merge-spacer {
   background-color: transparent;
 }
@@ -60,3 +72,121 @@
   background-color: var(--jp-git-diff-deleted-color);
   border: none;
 }
+
+/* Specific rules for the notebook merge conflict */
+.jp-git-diff-root .jp-Notebook-merge .jp-Merge-conflict,
+.jp-git-diff-root .jp-Notebook-merge .CodeMirror-merge-l-chunk,
+.jp-git-diff-root
+  .jp-Notebook-merge
+  .CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk,
+.jp-git-diff-root
+  .jp-Notebook-merge
+  .jp-Cellrow-outputs.jp-conflicted-outputs
+  .jp-CollapsiblePanel-header {
+  background-color: var(--jp-git-diff-deleted-color);
+}
+
+.jp-git-diff-root
+  .jp-Notebook-merge
+  .CodeMirror-line
+  .CodeMirror-merge-r-inserted {
+  background-color: var(--jp-git-diff-deleted-color);
+}
+
+.jp-git-diff-root
+  .jp-Notebook-merge
+  .CodeMirror-merge-pane-base
+  .CodeMirror-line
+  .CodeMirror-merge-m-deleted,
+.jp-git-diff-root
+  .jp-Notebook-merge
+  .CodeMirror-merge-pane-base
+  .CodeMirror-line
+  .CodeMirror-merge-l-deleted,
+.jp-git-diff-root
+  .jp-Notebook-merge
+  .CodeMirror-merge-pane-base
+  .CodeMirror-line
+  .CodeMirror-merge-r-deleted {
+  background-color: var(--jp-git-diff-deleted-color);
+  color: var(--jp-mirror-editor-string-color);
+}
+
+.jp-git-diff-root
+  .jp-Notebook-merge
+  .CodeMirror-merge-pane-base
+  .CodeMirror-line
+  .CodeMirror-merge-m-added,
+.jp-git-diff-root
+  .jp-Notebook-merge
+  .CodeMirror-merge-pane-base
+  .CodeMirror-line
+  .CodeMirror-merge-l-added,
+.jp-git-diff-root
+  .jp-Notebook-merge
+  .CodeMirror-merge-pane-base
+  .CodeMirror-line
+  .CodeMirror-merge-r-added {
+  background-color: var(--jp-git-diff-added-color);
+  color: var(--jp-mirror-editor-string-color);
+}
+
+/* Hide drag handles */
+.jp-git-diff-root .jp-Notebook-merge .jp-DragPanel-dragHandle {
+  display: none;
+}
+
+.jp-git-diff-parent-widget .jp-Merge-notebook-controls {
+	margin-bottom: 0px;
+	padding: 0px;
+	background-color: transparent;
+	border: none;
+}
+
+/* Hiding unchanged cells if told to */
+.jp-git-diff-root .nbdime-root.jp-mod-hideUnchanged .jp-Cell-merge.jp-Merge-unchanged {
+  display: none;
+}
+
+/* Show a marker with the number of cells hidden before */
+.jp-git-diff-root .nbdime-root.jp-mod-hideUnchanged .jp-Cell-merge[data-nbdime-NCellsHiddenBefore]::before {
+  content: attr(data-nbdime-NCellsHiddenBefore) " unchanged cell(s) hidden";
+  position: absolute;
+  width: 100%;
+  top: 0;
+  background-color: #eee;
+  border-top: solid #ccc 1px;
+  border-bottom: solid #ccc 1px;
+  text-align: center;
+}
+
+/* Show a marker with the number of cells hidden after (for hidden cells at end) */
+.jp-git-diff-root .nbdime-root.jp-mod-hideUnchanged .jp-Cell-merge[data-nbdime-NCellsHiddenAfter]::after {
+  content: attr(data-nbdime-NCellsHiddenAfter) " unchanged cell(s) hidden";
+  position: absolute;
+  width: 100%;
+  bottom: 0;
+  background-color: #eee;
+  border-top: solid #ccc 1px;
+  border-bottom: solid #ccc 1px;
+  text-align: center;
+}
+
+.jp-git-diff-root .nbdime-root.jp-mod-hideUnchanged .jp-Cell-merge[data-nbdime-NCellsHiddenBefore] {
+  padding-top: 40px;
+}
+
+.jp-git-diff-root .nbdime-root.jp-mod-hideUnchanged .jp-Cell-merge[data-nbdime-NCellsHiddenAfter] {
+  padding-bottom: 40px;
+}
+
+/* Marker for when all cells are unchanged and hidden */
+.jp-git-diff-root .nbdime-root.jp-mod-hideUnchanged .jp-Notebook-merge[data-nbdime-AllCellsHidden]::after {
+  content: "No changes, " attr(data-nbdime-AllCellsHidden) " unchanged cell(s) hidden";
+  display: block;
+  width: 100%;
+  background-color: #eee;
+  border-top: solid #ccc 1px;
+  border-bottom: solid #ccc 1px;
+  text-align: center;
+}
diff --git a/style/diff-text.css b/style/diff-text.css
index 6f3fa6ece..87145b0db 100644
--- a/style/diff-text.css
+++ b/style/diff-text.css
@@ -35,11 +35,14 @@
   background-repeat: repeat-x;
 }
 
-.jp-git-PlainText-diff .CodeMirror-merge-left .CodeMirror-merge-l-chunk {
+.jp-git-PlainText-diff .CodeMirror-merge-left .CodeMirror-merge-l-chunk,
+.jp-git-PlainText-diff .CodeMirror-merge-right .CodeMirror-merge-r-chunk {
   background-color: var(--jp-git-diff-deleted-color);
 }
 
-.jp-git-PlainText-diff .CodeMirror-merge-l-chunk {
+.jp-git-PlainText-diff .CodeMirror-merge-l-chunk,
+.jp-git-PlainText-diff .CodeMirror-merge-editor .CodeMirror-merge-l-chunk,
+.jp-git-PlainText-diff .CodeMirror-merge-editor .CodeMirror-merge-r-chunk {
   background-color: var(--jp-git-diff-added-color);
 }
 
@@ -58,3 +61,51 @@
   color: #999;
   background-color: var(--jp-git-diff-deleted-color);
 }
+
+/* Styles for horizontal scroll lock */
+.jp-git-PlainText-diff .CodeMirror-merge-scrolllock {
+  color: var(--jp--inverse-layout-color2);
+}
+.jp-git-PlainText-diff .CodeMirror-merge-scrolllock:after {
+  content: '\21db\00a0\00a0\21da';
+}
+.jp-git-PlainText-diff
+  .CodeMirror-merge-scrolllock.CodeMirror-merge-scrolllock-enabled:after {
+  content: '\21db\21da';
+}
+
+/* Styles for revert buttons handling */
+
+.jp-git-PlainText-diff .CodeMirror-merge-copybuttons-left,
+.jp-git-PlainText-diff .CodeMirror-merge-copybuttons-right {
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  line-height: 1;
+}
+
+.jp-git-PlainText-diff .CodeMirror-merge-copy {
+  position: absolute;
+  cursor: pointer;
+  color: var(--jp-brand-color1);
+  z-index: 3;
+}
+
+.jp-git-PlainText-diff .CodeMirror-merge-copy-reverse {
+  position: absolute;
+  cursor: pointer;
+  color: var(--jp-brand-color1);
+}
+
+.jp-git-PlainText-diff
+  .CodeMirror-merge-copybuttons-left
+  .CodeMirror-merge-copy {
+  left: 2px;
+}
+.jp-git-PlainText-diff
+  .CodeMirror-merge-copybuttons-right
+  .CodeMirror-merge-copy {
+  right: 2px;
+}
diff --git a/tests/commands.spec.tsx b/tests/commands.spec.tsx
index 17a333e57..35df9337c 100644
--- a/tests/commands.spec.tsx
+++ b/tests/commands.spec.tsx
@@ -37,9 +37,9 @@ describe('git-commands', () => {
       commands,
       shell: null as any
     };
-    const trans = nullTranslator.load('jupyterlab_git');
+
     model = new GitExtension(app as any);
-    addCommands(app as JupyterFrontEnd, model, null, null, trans);
+    addCommands(app as JupyterFrontEnd, model, null, null, nullTranslator);
   });
 
   describe('git:add-remote', () => {
diff --git a/tests/test-components/DiffModel.spec.tsx b/tests/test-components/DiffModel.spec.tsx
index 37b933349..b84512e4e 100644
--- a/tests/test-components/DiffModel.spec.tsx
+++ b/tests/test-components/DiffModel.spec.tsx
@@ -19,6 +19,7 @@ describe('DiffModel', () => {
   beforeEach(() => {
     model = new DiffModel({
       filename: 'KrabbyPattySecretFormula.txt',
+      repositoryPath: '/',
       challenger: {
         content: () => Promise.resolve('content'),
         label: 'challenger',
diff --git a/tests/test-components/NotebookDiff.spec.tsx b/tests/test-components/NotebookDiff.spec.tsx
index e139b2a66..eb21d7667 100644
--- a/tests/test-components/NotebookDiff.spec.tsx
+++ b/tests/test-components/NotebookDiff.spec.tsx
@@ -24,7 +24,8 @@ describe('NotebookDiff', () => {
         label: '83baee',
         source: '83baee'
       },
-      filename: '/path/to/File.ipynb'
+      filename: 'to/File.ipynb',
+      repositoryPath: 'path'
     });
 
     (requestAPI as jest.Mock).mockResolvedValueOnce(diffResponse);
@@ -67,7 +68,8 @@ describe('NotebookDiff', () => {
         label: '83baee',
         source: '83baee'
       },
-      filename: '/path/to/File.ipynb'
+      filename: 'to/File.ipynb',
+      repositoryPath: 'path'
     });
 
     (requestAPI as jest.Mock).mockRejectedValueOnce(
diff --git a/tests/test-components/PlainTextDiff.spec.tsx b/tests/test-components/PlainTextDiff.spec.tsx
index 227a658e4..c7c22fcee 100644
--- a/tests/test-components/PlainTextDiff.spec.tsx
+++ b/tests/test-components/PlainTextDiff.spec.tsx
@@ -21,7 +21,8 @@ describe('PlainTextDiff', () => {
         label: '83baee',
         source: '83baee'
       },
-      filename: '/path/to/File.py'
+      filename: 'to/File.py',
+      repositoryPath: 'path'
     });
 
     const mockMergeView = mergeView as jest.Mocked<typeof mergeView>;
@@ -59,7 +60,8 @@ describe('PlainTextDiff', () => {
         label: '83baee',
         source: '83baee'
       },
-      filename: '/path/to/File.py'
+      filename: 'to/File.py',
+      repositoryPath: 'path'
     });
 
     const mockMergeView = mergeView as jest.Mocked<typeof mergeView>;
diff --git a/ui-tests/tests/merge-conflict.spec.ts b/ui-tests/tests/merge-conflict.spec.ts
index 28e694d23..11d8501e5 100644
--- a/ui-tests/tests/merge-conflict.spec.ts
+++ b/ui-tests/tests/merge-conflict.spec.ts
@@ -30,7 +30,7 @@ test.describe('Merge conflict tests', () => {
     await page.waitForSelector('.jp-git-diff-root');
 
     // Verify 3-way merge view appears
-    const banner = page.locator('.jp-git-diff-banner');
+    const banner = page.locator('.jp-git-merge-banner');
     await expect(banner).toHaveText(/CURRENT/);
     await expect(banner).toHaveText(/RESULT/);
     await expect(banner).toHaveText(/INCOMING/);
@@ -50,7 +50,7 @@ test.describe('Merge conflict tests', () => {
     await page.waitForSelector('.jp-git-diff-root');
 
     // Verify notebook merge view appears
-    const banner = page.locator('.jp-git-diff-banner');
+    const banner = page.locator('.jp-git-merge-banner');
     await expect(banner).toHaveText(/CURRENT/);
     await expect(banner).toHaveText(/INCOMING/);