We are [rolling out](https://gitlab.com/gitlab-org/gitlab/-/issues/276918) a feature that: - Whenever possible, displays merge conflicts directly on the diff/comparison view under the "Changes" tab of a merge request. - For all cases of conflicts, informs what kind of conflict it is and how it can be fixed. For more context, refer to the epic https://gitlab.com/groups/gitlab-org/-/epics/4893+. Please provide any feedback in this issue! Thank you :open_hands:  ### Known issues/improvements 1. When a file has conflicts, we currently don't show any other changes except the conflicts. https://gitlab.com/gitlab-org/gitlab/-/issues/365823 will address this. <!-- triage-serverless v3 PLEASE DO NOT REMOVE THIS SECTION --> *This page may contain information related to upcoming products, features and functionality. It is important to note that the information presented is for informational purposes only, so please do not rely on the information for purchasing or planning purposes. Just like with all projects, the items mentioned on the page are subject to change or delay, and the development, release, and timing of any products, features, or functionality remain at the sole discretion of GitLab Inc.* <!-- triage-serverless v3 PLEASE DO NOT REMOVE THIS SECTION -->