gitlab-org--gitlab-foss/changelogs/unreleased/60141-mr-resolve-conflicts-file-headers-bad-positioning-on-scroll.yml

---
title: Fix file header style and position during scroll in a merge conflict resolution
merge_request: 31991
author:
type: fixed