Misalignment issue and unneeded scroll bar on the Version conflict box

STEPS TO REPRODUCE

1. Login as Admin and create an user (e.g. U1)
2. Edit a page (insert e.g. 'edit1')
3. Click 'Save'
4. Open a different browser (or an incognito window) and login with the user (U1)
5. Go to the same page and (force) edit it (insert e.g. 'edit2')
6. Click 'Save'
7. Go to the browser where Admin is logged in and type a word (e.g. 'edit3')
8. Click 'Save'
9. Select 'Fix each conflict individually'

EXPECTED RESULTS

On 'Page Properties' from the bottom of the Version conflict box, 'Content' section, the text input area field is aligned with 'custom version' drop-down.

Also, the blue area from 'Content' section is smaller and there is no scrollbar at the bottom of it (it's not needed).

ACTUAL RESULTS

The text input area field is not aligned with 'custom version' drop-down, which is placed lower-right.
The blue area from 'Content' section is a bit too large and there is a scrollbar at the bottom of it.

I've tested also on XWiki 11.8.1 and the items misalignment and the large blue area could not be reproduced, but the scrollbar was present there too.