diff --git a/plugins/settings-repository/lib/jgit-sources.jar b/plugins/settings-repository/lib/jgit-sources.jar
index b8c80ced1093..18f0c5bbc9e9 100644
Binary files a/plugins/settings-repository/lib/jgit-sources.jar and b/plugins/settings-repository/lib/jgit-sources.jar differ
diff --git a/plugins/settings-repository/lib/jgit.jar b/plugins/settings-repository/lib/jgit.jar
index dcfb31096b00..e7a49d347750 100644
Binary files a/plugins/settings-repository/lib/jgit.jar and b/plugins/settings-repository/lib/jgit.jar differ
diff --git a/plugins/settings-repository/testSrc/GitTestCase.kt b/plugins/settings-repository/testSrc/GitTestCase.kt
index c40b57a54576..59b6ec61810f 100644
--- a/plugins/settings-repository/testSrc/GitTestCase.kt
+++ b/plugins/settings-repository/testSrc/GitTestCase.kt
@@ -41,7 +41,7 @@ internal abstract class GitTestCase : IcsTestCase() {
           mergeSession.conflictResolvedForFile(file, MergeSession.Resolution.AcceptedTheirs)
         }
         else if (Arrays.equals(mergeData.LAST, AM.MARKER_ACCEPT_MY)) {
-          file.setBinaryContent(mergeData.LAST!!)
+          file.setBinaryContent(mergeData.LAST)
           mergeProvider.conflictResolvedForFile(file)
         }
         else {
@@ -51,7 +51,7 @@ internal abstract class GitTestCase : IcsTestCase() {
     }
   }
 
-  data class FileInfo(val name: String, val data: ByteArray)
+  class FileInfo(val name: String, val data: ByteArray)
 
   protected fun addAndCommit(path: String): FileInfo {
     val data = """<file path="$path" />""".toByteArray()