<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=584004) </details> <!--IssueSummary end--> ## Problem Sometimes the server responds with `has_conflicts: true` but `conflict_type: null`. This prevents us from being able to accurately display the conflict state. When both fields are present but in this inconsistent state, the UI cannot determine what type of conflict exists, making it impossible to show users the appropriate conflict information or resolution options. Example: https://gitlab.com/gitlab-com/content-sites/handbook/-/merge_requests/17166#note_2948044618 ## Proposal Always provide a `conflict_type` when `has_conflict` is true.