diff --git a/package.json b/package.json
index 34c0662b..6a37f746 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "connect-mongo": "^1.3.2",
     "cookie-parser": "^1.4.3",
     "cron": "^1.2.1",
+    "diff2html": "^2.3.0",
     "execa": "^0.6.3",
     "express": "^4.15.2",
     "express-brute": "^1.0.1",
diff --git a/server/configure.js b/server/configure.js
index d1b1c1ea..cec9ac1b 100644
--- a/server/configure.js
+++ b/server/configure.js
@@ -221,8 +221,8 @@ module.exports = (port, spinner) => {
       },
       () => {
         if (req.body.gitUseRemote === false) { return false }
-        return exec.stdout('git', ['remote', 'remove', 'origin'], { cwd: gitDir }).catch(err => {
-          if (_.includes(err.message, 'No such remote')) {
+        return exec.stdout('git', ['remote', 'rm', 'origin'], { cwd: gitDir }).catch(err => {
+          if (_.includes(err.message, 'No such remote') || _.includes(err.message, 'Could not remove')) {
             return true
           } else {
             throw err
diff --git a/server/views/pages/view.pug b/server/views/pages/view.pug
index 999428f6..bcf55d62 100644
--- a/server/views/pages/view.pug
+++ b/server/views/pages/view.pug
@@ -18,6 +18,9 @@ block rootNavRight
     a.button.is-outlined(href='/source/' + pageData.meta.path)
       i.icon-loader
       span Source
+    a.button.is-outlined(href='/diff/' + pageData.meta.path)
+      i.icon-flow-merge
+      span Diff
     if rights.write
       a.button(href='/edit/' + pageData.meta.path)
         i.icon-document-text
diff --git a/yarn.lock b/yarn.lock
index 040cfa03..96e8a8ff 100644
Binary files a/yarn.lock and b/yarn.lock differ