File header for merge conflict is sticky but reveals content underneath
## Bug
File header does not align to the top of the page as you can see content underneath when scrolling
## Expected behavior
The file header should be sticky without content being reveal above of it when scrolling
## Video of bug
{width=900 height=355}
issue