diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 351b3a3956b5..993fb7faac94 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -905,8 +905,13 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
     // Do not autolink if someone explicitly tries to remove a link from message.
     // https://github.com/Expensify/App/issues/9090
     const autolinkFilter = {filterRules: _.filter(_.pluck(parser.rules, 'name'), name => name !== 'autolink')};
+<<<<<<< HEAD
     const htmlForNewComment = parser.replace(textForNewComment, autolinkFilter);
     const originalMessageHTML = parser.replace(originalReportAction.message[0].html, autolinkFilter);
+=======
+    const htmlForNewComment = parser.replace(markdownForNewComment, autolinkFilter);
+    const parsedOriginalCommentHTML = parser.replace(parser.htmlToMarkdown(originalCommentHTML), autolinkFilter);
+>>>>>>> 0d024bed1a (Merge pull request #13703 from Expensify/yuwen-htmlToMarkdown)
 
     //  Delete the comment if it's empty
     if (_.isEmpty(htmlForNewComment)) {