diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java
index f0bc186d9e2d..1a2a54038458 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java
@@ -84,6 +84,7 @@ public final class HgConflictResolver {
     }, ModalityState.defaultModalityState());
   }
 
+  @NotNull
   public static List<VirtualFile> findConflicts(final Project project, VirtualFile repo) {
     Map<HgFile, HgResolveStatusEnum> resolves = new HgResolveCommand(project).getListSynchronously(repo);
     final List<VirtualFile> conflicts = new ArrayList<VirtualFile>();