[stable27] fix: handle non markdown files in conflicts

[stable27] fix: handle non markdown files in conflicts #1310