diff --git a/src/commands/openConflict.ts b/src/commands/openConflict.ts
index bd856ede..01842db1 100644
--- a/src/commands/openConflict.ts
+++ b/src/commands/openConflict.ts
@@ -16,7 +16,12 @@ export class OpenConflict extends Command {
     this.runByRepository(selection[0].resourceUri, async (repo, result) => {
       const info = await repo.repository.getInfo(result.fsPath);
 
-      if (!info.conflict || !info.conflict.curBaseFile || !info.conflict.prevWcFile || !info.conflict.prevBaseFile) {
+      if (
+        !info.conflict ||
+        !info.conflict.curBaseFile ||
+        !info.conflict.prevWcFile ||
+        !info.conflict.prevBaseFile
+      ) {
         return;
       }
 
@@ -27,7 +32,12 @@ export class OpenConflict extends Command {
       // TODO: _open.mergeEditor is not currently exposed to non-builtin VSCode extensions.
       // Update the command when there is an externally facing API.
       // See https://github.com/microsoft/vscode/tree/15bdea120dc16143a6ec01ad5f12bc273632a483/extensions/git/src/commands.ts#L748 for example usage.
-      await commands.executeCommand("_open.mergeEditor", { base, input1, input2, output: result });
+      await commands.executeCommand("_open.mergeEditor", {
+        base,
+        input1,
+        input2,
+        output: result
+      });
     });
   }
 }
diff --git a/src/common/types.ts b/src/common/types.ts
index 7d9aa177..87509846 100644
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -47,13 +47,15 @@ export interface ISvnInfo {
   conflict?: {
     operation: string;
     type: string;
-    version: [{
-      kind: string;
-      pathInRepos: string;
-      reposUrl: string;
-      revision: string;
-      side: string;
-    }];
+    version: [
+      {
+        kind: string;
+        pathInRepos: string;
+        reposUrl: string;
+        revision: string;
+        side: string;
+      }
+    ];
     prevBaseFile?: string;
     prevWcFile?: string;
     curBaseFile?: string;
diff --git a/src/resource.ts b/src/resource.ts
index f7695c87..4083341b 100644
--- a/src/resource.ts
+++ b/src/resource.ts
@@ -49,7 +49,7 @@ export class Resource implements SourceControlResourceState {
     private _renameResourceUri?: Uri,
     private _props?: string,
     private _remote: boolean = false
-  ) { }
+  ) {}
 
   @memoize
   get resourceUri(): Uri {