When upgrading from 7.1.2 to 7.2 I got a merge conflict for XWiki.Admin and the text is oveflowing, see screenshot