diff --git a/src/test/scala/gitbucket/core/service/MergeServiceSpec.scala b/src/test/scala/gitbucket/core/service/MergeServiceSpec.scala
index be90da4..e8db486 100644
--- a/src/test/scala/gitbucket/core/service/MergeServiceSpec.scala
+++ b/src/test/scala/gitbucket/core/service/MergeServiceSpec.scala
@@ -33,7 +33,7 @@
       assert(service.checkConflictCache("user1", "repo1", branch, issueId) == None)
       val conflicted = service.checkConflict("user1", "repo1", branch, issueId)
       assert(service.checkConflictCache("user1", "repo1", branch, issueId) == Some(false))
-      assert(conflicted  == false)
+      assert(conflicted.isEmpty)
     }
     it("checkConflict true if not conflicted, and create cache") {
       val repo2Dir = initRepository("user1","repo2")
@@ -42,7 +42,7 @@
       }
       assert(service.checkConflictCache("user1", "repo2", branch, issueId) == None)
       val conflicted = service.checkConflict("user1", "repo2", branch, issueId)
-      assert(conflicted  == true)
+      assert(conflicted.isDefined)
       assert(service.checkConflictCache("user1", "repo2", branch, issueId) == Some(true))
     }
   }