Edits toolbar goes on top of Open Merge Editor blue button

[joaomoreno]

Have Copilot do edits on a file which has merge conflicts.

[hediet]

I believe Ladislau Szomoru (@lszomoru) fixed this.

[lszomoru]

I did create a PR to fix this but it is blocked due to notebooks - #268005