Enable display_merge_conflicts_in_diff feature flag by default

What does this MR do and why?

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.

Related to #276918 (closed)