---
title: Align UI of Merge Conflicts app with our design system
merge_request: 59400
author:
type: other