diff --git a/src/main/scala/gitbucket/core/service/MergeService.scala b/src/main/scala/gitbucket/core/service/MergeService.scala
index 6888c8a..ed2b4b4 100644
--- a/src/main/scala/gitbucket/core/service/MergeService.scala
+++ b/src/main/scala/gitbucket/core/service/MergeService.scala
@@ -298,7 +298,7 @@
 
     s"Can't merge ${mergeTip.name} into ${mergeBaseTip.name}\n\n" +
       "Conflicting files:\n" +
-      mergeResults.asScala.map { case (key, _) => "- " + key + "\n" }.mkString
+      mergeResults.asScala.map { case (key, _) => "- `" + key + "`\n" }.mkString
   }
 
 }