Merge conflict for XWiki.Admin when upgrading from default 7.1.2 to default 7.2

I've used the default jetty/hsqldb distribution and done the following:

• unzip 7.1.2
• unzip 7.2 and replace the data dir from the one from 7.1.2
• start xwiki and perform the upgrade process
• I got a merge conflict for XWiki.Admin which shouldn't happen since I didn't modify anything. See screenshots.