fix(client): three-way merge when a file changed on both sides

backend/.golangci.yml

@@ -44,6 +44,7 @@ linters:
         - (*github.com/fsnotify/fsnotify.Watcher).Close
         - os.Unsetenv
         - os.Remove
+        - os.RemoveAll
         - fmt.Fprint
         - fmt.Fprintf
         - fmt.Fprintln